# [PATCH] mergetool: Use merge.tool config option. 5 messages from 2007-03-18 to 2007-03-19. Participants: James Bowes, Junio C Hamano, Theodore Tso. Thread: https://gitlist.dev/t/7295 ## James Bowes, 2007-03-18 16:13 Subject: [PATCH] mergetool: Use merge.tool config option. Message-ID: <11742343911678-git-send-email-jbowes@dangerouslyinc.com> URL: https://gitlist.dev/e/11742343911678-git-send-email-jbowes%40dangerouslyinc.com ``` If no merge program was supplied on the commandline, and the config option merge.tool was set to a valid value, then mergetool would unset $merge_tool and instead try to find an installed merge program. This patch removes the code that unset $merge_tool, so the merge.tool config option will always be used, if set. Signed-off-by: James Bowes --- git-mergetool.sh | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/git-mergetool.sh b/git-mergetool.sh index 52386a5..19788a1 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -288,10 +288,6 @@ done if test -z "$merge_tool"; then merge_tool=`git-config merge.tool` - if test $merge_tool = kdiff3 -o $merge_tool = tkdiff -o \ - $merge_tool = xxdiff -o $merge_tool = meld ; then - unset merge_tool - fi fi if test -z "$merge_tool" ; then -- 1.5.0.3 ``` ## Junio C Hamano, 2007-03-19 00:18 Subject: Re: [PATCH] mergetool: Use merge.tool config option. Message-ID: <7vwt1em6gf.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vwt1em6gf.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <11742343911678-git-send-email-jbowes@dangerouslyinc.com> ``` James Bowes writes: > If no merge program was supplied on the commandline, and the config option > merge.tool was set to a valid value, then mergetool would unset $merge_tool > and instead try to find an installed merge program. This patch removes the code > that unset $merge_tool, so the merge.tool config option will always be used, if > set. The problem description looks correct, but I think the original meant to reject configuration value for merge_tool that is not supported with the version of the script (and screwed up). > Signed-off-by: James Bowes > --- > git-mergetool.sh | 4 ---- > 1 files changed, 0 insertions(+), 4 deletions(-) > > diff --git a/git-mergetool.sh b/git-mergetool.sh > index 52386a5..19788a1 100755 > --- a/git-mergetool.sh > +++ b/git-mergetool.sh > @@ -288,10 +288,6 @@ done > > if test -z "$merge_tool"; then > merge_tool=`git-config merge.tool` > - if test $merge_tool = kdiff3 -o $merge_tool = tkdiff -o \ > - $merge_tool = xxdiff -o $merge_tool = meld ; then > - unset merge_tool > - fi > fi > > if test -z "$merge_tool" ; then IOW, wouldn't this be a better way? if test -z "$merge_tool" then merge_tool=`git-config merge.tool` case "$merge_tool" in kdiff3 | tkdiff | xxdiff | meld | emerge) ;; # happy *) echo >&2 "We do not know how to drive $merge_tool" echo >&2 "Resetting to default..." unset merge_tool ;; esac fi ``` ## James Bowes, 2007-03-19 01:11 Subject: Re: [PATCH] mergetool: Use merge.tool config option. Message-ID: <3f80363f0703181811x54acb3f4n689f4fd68f5a5dbe@mail.gmail.com> URL: https://gitlist.dev/e/3f80363f0703181811x54acb3f4n689f4fd68f5a5dbe%40mail.gmail.com In-Reply-To: <7vwt1em6gf.fsf@assigned-by-dhcp.cox.net> ``` On 3/18/07, Junio C Hamano wrote: > The problem description looks correct, but I think the original > meant to reject configuration value for merge_tool that is not > supported with the version of the script (and screwed up). There's a bit later on in mergetool that errors out if you have provided an unknown merge program (either via the command line or through your config). The command line and the config ways should probably behave the same, eh? If so, the case block should be brought up one level like so: > IOW, wouldn't this be a better way? > > if test -z "$merge_tool" > then > merge_tool=`git-config merge.tool` fi case "$merge_tool" in kdiff3 | tkdiff | xxdiff | meld | emerge) ;; # happy *) echo >&2 "We do not know how to drive $merge_tool" echo >&2 "Resetting to default..." unset merge_tool ;; esac And then remove the 'Unknown mergetool' bit. I think either way is fine since they both let you know that you've entered gobbledeegook or forgot to install something, so I'll defer to you all for the choice on which way to go. -James ``` ## Theodore Tso, 2007-03-19 02:32 Subject: Re: [PATCH] mergetool: Use merge.tool config option. Message-ID: <20070319023238.GC11371@thunk.org> URL: https://gitlist.dev/e/20070319023238.GC11371%40thunk.org In-Reply-To: <3f80363f0703181811x54acb3f4n689f4fd68f5a5dbe@mail.gmail.com> ``` It seemed to me that Junio's suggestion made the most amount of sense, but I tinkered with the with the warning message to make it clear that the cause of the warning was a bugus tool in the merge.tool configuration parameter. This has also been pushed out to git://repo.or.cz/git/mergetool.git Junio, please pull if you approve... - Ted commit d6678c28e30e836449092a2917d4b0bd6254b06c Author: Theodore Ts'o Date: Sun Mar 18 22:30:10 2007 -0400 mergetool: print an appropriate warning if merge.tool is unknown Also add support for vimdiff Signed-off-by: "Theodore Ts'o" diff --git a/git-mergetool.sh b/git-mergetool.sh index 563c5c0..7942fd0 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -288,10 +288,15 @@ done if test -z "$merge_tool"; then merge_tool=`git-config merge.tool` - if test $merge_tool = kdiff3 -o $merge_tool = tkdiff -o \ - $merge_tool = xxdiff -o $merge_tool = meld ; then - unset merge_tool - fi + case "$merge_tool" in + kdiff3 | tkdiff | xxdiff | meld | emerge | vimdiff) + ;; # happy + *) + echo >&2 "git config option merge.tool set to unknown tool: $merge_tool" + echo >&2 "Resetting to default..." + unset merge_tool + ;; + esac fi if test -z "$merge_tool" ; then ``` ## Junio C Hamano, 2007-03-19 04:09 Subject: Re: [PATCH] mergetool: Use merge.tool config option. Message-ID: <7vircxnabq.fsf@assigned-by-dhcp.cox.net> URL: https://gitlist.dev/e/7vircxnabq.fsf%40assigned-by-dhcp.cox.net In-Reply-To: <20070319023238.GC11371@thunk.org> ``` Theodore Tso writes: > It seemed to me that Junio's suggestion made the most amount of sense, > but I tinkered with the with the warning message to make it clear that > the cause of the warning was a bugus tool in the merge.tool > configuration parameter. > > This has also been pushed out to git://repo.or.cz/git/mergetool.git > > Junio, please pull if you approve... Surely, and thanks. I think your message is much nicer. ```