From: Junio C Hamano <gitster@pobox.com>
To: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Cc: git@vger.kernel.org, Thomas Rast <tr@thomasrast.ch>
Subject: Re: [PATCH v3 1/2] rerere "remaining"
Date: Wed, 16 Feb 2011 13:14:20 -0800 [thread overview]
Message-ID: <7vk4gziswj.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1297853265-18993-2-git-send-email-martin.von.zweigbergk@gmail.com> (Martin von Zweigbergk's message of "Wed\, 16 Feb 2011 05\:47\:44 -0500")
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> writes:
> Junio, I wasn't sure how to handle the sign-off etc, so feel free to
> modify those as appropriate.
At this point I think the primary value of the change is your adding
"rerere_remaining()" to only where it matters (i.e. the isolation of the
change) and you should get the credit as the primary author. Mine was
impossible to read because I contaminated merge_rr in a wrong place and
had to work it around in unrelated codepaths all over the place.
This was much cleaner and easier to read.
> builtin/rerere.c | 17 +++++++++--
> rerere.c | 79 +++++++++++++++++++++++++++++++++++++++++++++++-------
> rerere.h | 8 +++++
> 3 files changed, 91 insertions(+), 13 deletions(-)
>
> diff --git a/builtin/rerere.c b/builtin/rerere.c
> index 642bf35..7b9fe18 100644
> --- a/builtin/rerere.c
> +++ b/builtin/rerere.c
> @@ -8,7 +8,7 @@
> #include "xdiff-interface.h"
>
> static const char * const rerere_usage[] = {
> - "git rerere [clear | status | diff | gc]",
> + "git rerere [clear | status | remaining | diff | gc]",
> NULL,
> };
>
> @@ -154,9 +154,20 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
> } else if (!strcmp(argv[0], "gc"))
> garbage_collect(&merge_rr);
> else if (!strcmp(argv[0], "status"))
> - for (i = 0; i < merge_rr.nr; i++)
> + for (i = 0; i < merge_rr.nr; i++) {
> printf("%s\n", merge_rr.items[i].string);
> - else if (!strcmp(argv[0], "diff"))
> + }
Unnecessary {} around a single printf(). Will clean-up.
Thanks.
next prev parent reply other threads:[~2011-02-16 21:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-08 3:08 [PATCH] mergetool: don't skip modify/remove conflicts Martin von Zweigbergk
2011-02-09 21:45 ` Junio C Hamano
2011-02-11 2:46 ` Martin von Zweigbergk
2011-02-13 4:09 ` [PATCH v2 0/2] " Martin von Zweigbergk
2011-02-13 4:09 ` [PATCH v2 1/2] " Martin von Zweigbergk
2011-02-15 0:54 ` Junio C Hamano
2011-02-15 3:30 ` Martin von Zweigbergk
2011-02-15 20:12 ` Junio C Hamano
2011-02-16 10:47 ` [PATCH v3 0/2] " Martin von Zweigbergk
2011-02-16 10:47 ` [PATCH v3 1/2] rerere "remaining" Martin von Zweigbergk
2011-02-16 21:14 ` Junio C Hamano [this message]
2011-02-16 10:47 ` [PATCH v3 2/2] mergetool: don't skip modify/remove conflicts Martin von Zweigbergk
2011-02-13 4:09 ` [PATCH v2 2/2] rerere: factor out common conflict search code Martin von Zweigbergk
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=7vk4gziswj.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=martin.von.zweigbergk@gmail.com \
--cc=tr@thomasrast.ch \
/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).