From: David Aguilar <davvid@gmail.com>
To: Markus Heidelberg <markus.heidelberg@web.de>
Cc: gitster@pobox.com, charles@hashpling.org, git@vger.kernel.org
Subject: Re: git-{diff,merge} refactor round 2
Date: Sat, 4 Apr 2009 20:34:44 -0700 [thread overview]
Message-ID: <20090405033443.GA16219@gmail.com> (raw)
In-Reply-To: <200904050458.17708.markus.heidelberg@web.de>
On 0, Markus Heidelberg <markus.heidelberg@web.de> wrote:
> David Aguilar, 01.04.2009:
> > Here's the 2nd round of refactoring.
>
> I just noticed that mergetool.<mergetool>.path doesn't work anymore.
> git grep mergetool.*path only hits one line in git-difftool--helper.sh
> Neither does it seem to work with difftool, but I'm gonna go to bed now.
>
> Markus
>
Oops. Well, I have one final patch that removes the last bit of
redundant code. It also fixed this problem so I'll go ahead
and send it (it's based on top of da/difftool mentioned in
pu).
Since the test cases didn't catch that breakage I added a test
for it.
Look for a patch called:
mergetool--lib: consolidate the last redundant bits in {diff,merge}tool
--
David
next prev parent reply other threads:[~2009-04-05 3:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-01 12:55 git-{diff,merge} refactor round 2 David Aguilar
2009-04-01 12:55 ` [PATCH 01/10] difftool: add support for a difftool.prompt config variable David Aguilar
2009-04-01 12:55 ` [PATCH 02/10] mergetool: use $( ... ) instead of `backticks` David Aguilar
2009-04-01 12:55 ` [PATCH 03/10] Add a mergetool-lib scriptlet for holding common merge tool functions David Aguilar
2009-04-01 12:55 ` [PATCH 04/10] mergetool: use get_mergetool_path from git-mergetool-lib David Aguilar
2009-04-01 12:55 ` [PATCH 05/10] difftool: " David Aguilar
2009-04-01 12:55 ` [PATCH 06/10] mergetool: use valid_tool " David Aguilar
2009-04-01 12:55 ` [PATCH 07/10] difftool: " David Aguilar
2009-04-01 12:55 ` [PATCH 08/10] mergetool-lib: introduce run_mergetool David Aguilar
2009-04-01 12:55 ` [PATCH 09/10] difftool: use run_mergetool from git-mergetool-lib David Aguilar
2009-04-01 12:55 ` [PATCH 10/10] mergetool: " David Aguilar
2009-04-01 22:54 ` Markus Heidelberg
2009-04-02 20:02 ` Charles Bailey
2009-04-02 20:13 ` Markus Heidelberg
2009-04-02 20:16 ` Markus Heidelberg
2009-04-03 1:54 ` David Aguilar
2009-04-01 22:47 ` [PATCH 08/10] mergetool-lib: introduce run_mergetool Markus Heidelberg
2009-04-01 22:39 ` [PATCH 03/10] Add a mergetool-lib scriptlet for holding common merge tool functions Markus Heidelberg
2009-04-02 3:58 ` David Aguilar
2009-04-02 19:59 ` git-{diff,merge} refactor round 2 Charles Bailey
2009-04-05 2:58 ` Markus Heidelberg
2009-04-05 3:34 ` David Aguilar [this message]
2009-04-05 9:45 ` Junio C Hamano
2009-04-05 21:15 ` David Aguilar
2009-04-05 22:15 ` Markus Heidelberg
2009-04-06 0:33 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090405033443.GA16219@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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.