From: David Aguilar <davvid@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: markus.heidelberg@web.de, git@vger.kernel.org, charles@hashpling.org
Subject: Re: [PATCH v4 14/14] difftool/mergetool: refactor commands to use git-mergetool--lib
Date: Tue, 7 Apr 2009 23:35:58 -0700 [thread overview]
Message-ID: <20090408063557.GA14404@gmail.com> (raw)
In-Reply-To: <7vtz4zr80v.fsf@gitster.siamese.dyndns.org>
On 0, Junio C Hamano <gitster@pobox.com> wrote:
> Markus Heidelberg <markus.heidelberg@web.de> writes:
>
> >> + tools="$(echo "$tools" | sed -e 's/ +/ /g')"
> >
> > Doesn't work for me. For me 's/ \+/ /g' works.
> > ...like this: 's/[ ]\+/ /g' (space and tab)
>
> Pleae don't. "s/ */ /g' should be the most portable (the point being "do
> not use one-or-more +").
v5 14/14. good stuff.
> > Looks good to me, after these last 2 issues are adjusted.
> > Maybe resend the whole series then, so that Junio can apply them easily?
>
> Thanks. I've replaced the series with the following applied on top of the
> 'master', but I won't be merging them to 'next' for tonight, I guess.
>
> ...
> [PATCH v2 07/14] difftool: add a -y shortcut for --no-prompt
> [PATCH v2 09/14] difftool: move 'git-difftool' out of contrib
> [PATCH v3 10/14] difftool: add various git-difftool tests
> [PATCH v2 11/14] difftool: add support for a difftool.prompt config variable
> [PATCH v4 14/14] difftool/mergetool: refactor commands to use git-mergetool--lib
>
> It appears that, assuming that up to 13/14 above is what you two expected
> me to pick up, we would perhaps need to only replace 14/14?
Yup
>
> As the final sanity check, please eyeball the attached interdiff, created
> this way:
That looks right to me.
>
> $ git checkout master^0
> $ git am -s ./+da-fourteen-patches
> $ A=$(git rev-parse HEAD)
> $ git reset --hard master
> $ git merge da/difftool ;# old series
> $ git diff --stat -p HEAD $A ;# what's new in the new series?
>
> Documentation/config.txt | 3 +-
> Documentation/git-mergetool.txt | 2 +-
> Documentation/merge-config.txt | 6 +-
> command-list.txt | 1 -
> contrib/completion/git-completion.bash | 2 +-
> git-mergetool--lib.sh | 237 ++++++++++++++++++--------------
> t/t7800-difftool.sh | 4 +-
> 7 files changed, 144 insertions(+), 111 deletions(-)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> ...
--
David
next prev parent reply other threads:[~2009-04-08 6:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-07 23:00 [PATCH v4 14/14] difftool/mergetool: refactor commands to use git-mergetool--lib David Aguilar
2009-04-08 5:33 ` Markus Heidelberg
2009-04-08 6:09 ` Junio C Hamano
2009-04-08 6:35 ` David Aguilar [this message]
2009-04-08 6:40 ` Charles Bailey
2009-04-08 6:56 ` Junio C Hamano
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=20090408063557.GA14404@gmail.com \
--to=davvid@gmail.com \
--cc=charles@hashpling.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=markus.heidelberg@web.de \
/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).