undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revert: change help_msg() to take no argument

Browse Source 
This is needed because the following commits will make it
possible to cherry-pick many commits instead of just one.

So it will be possible to pass for example ranges of commits
to "git cherry-pick" and this means that it will not be
possible to use the arguments passed to "git cherry-pick" in
the help message.

The help message will have to use the sha1 of the currently
processed commit.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2010-06-02 07:58:37 +02:00 committed by Junio C Hamano
parent 7af46595b2
commit 4b2095622f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
builtin/revert.c
View File

@ -239,7 +239,7 @@ static void set_author_ident_env(const char *message)
sha1_to_hex(commit->object.sha1)); sha1_to_hex(commit->object.sha1));
} }
static char *help_msg(const char *name) static char *help_msg(void)
{ {
struct strbuf helpbuf = STRBUF_INIT; struct strbuf helpbuf = STRBUF_INIT;
char *msg = getenv("GIT_CHERRY_PICK_HELP"); char *msg = getenv("GIT_CHERRY_PICK_HELP");
@ -255,7 +255,7 @@ static char *help_msg(const char *name)
strbuf_addf(&helpbuf, " with: \n" strbuf_addf(&helpbuf, " with: \n"
"\n" "\n"
" git commit -c %s\n", " git commit -c %s\n",
name); sha1_to_hex(commit->object.sha1));
} }
else else
strbuf_addch(&helpbuf, '.'); strbuf_addch(&helpbuf, '.');
@ -357,7 +357,7 @@ static void do_recursive_merge(struct commit *base, struct commit *next,
} }
write_message(msgbuf, defmsg); write_message(msgbuf, defmsg);
fprintf(stderr, "Automatic %s failed.%s\n", fprintf(stderr, "Automatic %s failed.%s\n",
me, help_msg(commit_name)); me, help_msg());
rerere(allow_rerere_auto); rerere(allow_rerere_auto);
exit(1); exit(1);
} }
@ -484,7 +484,7 @@ static int do_pick_commit(void)
free_commit_list(remotes); free_commit_list(remotes);
if (res) { if (res) {
fprintf(stderr, "Automatic %s with strategy %s failed.%s\n", fprintf(stderr, "Automatic %s with strategy %s failed.%s\n",
me, strategy, help_msg(commit_name)); me, strategy, help_msg());
rerere(allow_rerere_auto); rerere(allow_rerere_auto);
exit(1); exit(1);
} }