From: Johannes Sixt <j6t@kdbg.org>
To: "René Scharfe" <l.s.r@web.de>
Cc: Git List <git@vger.kernel.org>,
Pat Thoyts <patthoyts@users.sourceforge.net>,
Junio C Hamano <gitster@pobox.com>,
Dennis Kaarsemaker <dennis@kaarsemaker.net>
Subject: Re: [PATCH] git-gui: stop using deprecated merge syntax
Date: Sat, 24 Sep 2016 20:22:28 +0200 [thread overview]
Message-ID: <a5b001fd-3ba2-bcc0-2104-eb630796ab09@kdbg.org> (raw)
In-Reply-To: <cbb1815e-0ebc-e103-927e-14d7d038245a@web.de>
Am 24.09.2016 um 13:30 schrieb René Scharfe:
> Starting with v2.5.0 git merge can handle FETCH_HEAD internally and
> warns when it's called like 'git merge <message> HEAD <commit>' because
> that syntax is deprecated. Use this feature in git-gui and get rid of
> that warning.
>
> Signed-off-by: Rene Scharfe <l.s.r@web.de>
> ---
> Tested only _very_ lightly!
>
> git-gui/lib/merge.tcl | 7 +------
> 1 file changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/git-gui/lib/merge.tcl b/git-gui/lib/merge.tcl
> index 460d32f..5ab6f8f 100644
> --- a/git-gui/lib/merge.tcl
> +++ b/git-gui/lib/merge.tcl
> @@ -112,12 +112,7 @@ method _start {} {
> close $fh
> set _last_merged_branch $branch
>
> - set cmd [list git]
> - lappend cmd merge
> - lappend cmd --strategy=recursive
> - lappend cmd [git fmt-merge-msg <[gitdir FETCH_HEAD]]
> - lappend cmd HEAD
> - lappend cmd $name
> + set cmd [list git merge --strategy=recursive FETCH_HEAD]
>
> ui_status [mc "Merging %s and %s..." $current_branch $stitle]
> set cons [console::new [mc "Merge"] "merge $stitle"]
>
Much better than my version. I had left fmt-merge-msg and added --no-log
to treat merge.log config suitably. But this works too, and is much more
obvious.
Tested-by: Johannes Sixt <j6t@kdbg.org>
-- Hannes
next prev parent reply other threads:[~2016-09-24 18:22 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-24 11:30 [PATCH] git-gui: stop using deprecated merge syntax René Scharfe
2016-09-24 18:22 ` Johannes Sixt [this message]
2016-09-25 18:39 ` Junio C Hamano
2016-09-26 17:23 ` Stefan Beller
2016-10-03 8:30 ` Pat Thoyts
2016-10-03 9:45 ` René Scharfe
2016-10-03 23:15 ` Pat Thoyts
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a5b001fd-3ba2-bcc0-2104-eb630796ab09@kdbg.org \
--to=j6t@kdbg.org \
--cc=dennis@kaarsemaker.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=l.s.r@web.de \
--cc=patthoyts@users.sourceforge.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).