From: Stefan Saasen <ssaasen@atlassian.com>
To: David Aguilar <davvid@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH v2] mergetools/diffmerge: support DiffMerge as a git mergetool
Date: Sun, 13 Oct 2013 09:27:41 +1100 [thread overview]
Message-ID: <CADoxLGM20QRihVLfbg0shdT2QZLjMBqvxy5N=AeLWR_TsTsugA@mail.gmail.com> (raw)
In-Reply-To: <CAJDDKr7LgCXjZLzZqKkkUnqt4EGdcA0wvf=uT8KZXba-+q00Sw@mail.gmail.com>
Not a problem. I'll change it to:
tools="$tools gvimdiff diffuse diffmerge ecmerge"
tools="$tools p4merge araxis bc3 code compare"
and send a v3. Thanks for the review David.
On 13 October 2013 06:55, David Aguilar <davvid@gmail.com> wrote:
> Thanks for the re-roll. We're very close; see below.
>
> On Fri, Oct 11, 2013 at 10:01 PM, Stefan Saasen <ssaasen@atlassian.com> wrote:
>> DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and Linux.
>>
>> See http://www.sourcegear.com/diffmerge/
>>
>> DiffMerge includes a script `/usr/bin/diffmerge` that can be used to launch the
>> graphical compare tool.
>>
>> This change adds mergetool support for DiffMerge and adds 'diffmerge' as an
>> option to the mergetool help.
>>
>> Signed-off-by: Stefan Saasen <ssaasen@atlassian.com>
>> Acked-by: David Aguilar <davvid@gmail.com>
>> ---
>> contrib/completion/git-completion.bash | 2 +-
>> git-mergetool--lib.sh | 3 ++-
>> mergetools/diffmerge | 15 +++++++++++++++
>> 3 files changed, 18 insertions(+), 2 deletions(-)
>> create mode 100644 mergetools/diffmerge
>>
>> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
>> index e1b7313..07b0ba5 100644
>> --- a/contrib/completion/git-completion.bash
>> +++ b/contrib/completion/git-completion.bash
>> @@ -1188,7 +1188,7 @@ _git_diff ()
>> __git_complete_revlist_file
>> }
>>
>> -__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff
>> +__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff
>> tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare
>> "
>>
>> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
>> index feee6a4..0fcb253 100644
>> --- a/git-mergetool--lib.sh
>> +++ b/git-mergetool--lib.sh
>> @@ -250,7 +250,8 @@ list_merge_tool_candidates () {
>> else
>> tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
>> fi
>> - tools="$tools gvimdiff diffuse ecmerge p4merge araxis bc3 codecompare"
>> + tools="$tools gvimdiff diffuse diffmerge ecmerge "
>> + tools+="p4merge araxis bc3 codecompare"
>
> I don't believe "+=" is portable across all POSIX shells.
>
> I tried this on "dash" (which is the default /bin/sh on Debian) and it
> was not understood there.
>
> $ f="1 2 3"
> $ f+=" 4"
> /bin/dash: 2: f+= 4: not found
>
> I think we should stick to the tools="$tools ....." style of concatenation.
>
> Everything else looks good to me.
>
> Thanks,
> --
> David
prev parent reply other threads:[~2013-10-12 22:28 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-12 5:01 [PATCH v2] mergetools/diffmerge: support DiffMerge as a git mergetool Stefan Saasen
2013-10-12 19:55 ` David Aguilar
2013-10-12 22:27 ` Stefan Saasen [this message]
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='CADoxLGM20QRihVLfbg0shdT2QZLjMBqvxy5N=AeLWR_TsTsugA@mail.gmail.com' \
--to=ssaasen@atlassian.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/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).