From: Charles Bailey <charles@hashpling.org>
To: David Aguilar <davvid@gmail.com>
Cc: gitster@pobox.com, git@vger.kernel.org
Subject: Re: git-{diff,merge} refactor round 2
Date: Thu, 2 Apr 2009 20:59:18 +0100 [thread overview]
Message-ID: <20090402195918.GA13817@hashpling.org> (raw)
In-Reply-To: <1238590514-41893-1-git-send-email-davvid@gmail.com>
On Wed, Apr 01, 2009 at 05:55:04AM -0700, David Aguilar wrote:
> Here's the 2nd round of refactoring.
Again, I reply in summary form...
[02/10] - I ack this.
[03-07 / 10] - fine. I'm not sure, but should they be one commit?
They're really about consolidating blocks from one place to another
and the change might be more 'obvious' as a single commit.
[08/10] Now that we've isolated the run_mergetool, can we get it to
return the value of '$status' (either the result of the tool or of
check_unchanged) as its exit code so that we know whether the merge
succeeded?
[10/10] Then this chunk:
+ run_mergetool "$merge_tool" "$present"
+ status=$?
if test "$status" -ne 0; then
can validly become:
if ! run_mergtool "$merge_tool" "$present"; then
which seems clearer to me.
--
Charles Bailey
http://ccgi.hashpling.plus.com/blog/
next prev parent reply other threads:[~2009-04-02 20:01 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 ` Charles Bailey [this message]
2009-04-05 2:58 ` git-{diff,merge} refactor round 2 Markus Heidelberg
2009-04-05 3:34 ` David Aguilar
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=20090402195918.GA13817@hashpling.org \
--to=charles@hashpling.org \
--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.
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.