development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-12 11:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

cherry-pick: do not give irrelevant advice when cherry-pick punted

Browse source 
If a cherry-pick did not even start because the working tree had local
changes that would overlap with the operation, we shouldn't be advising
the users to resolve conflicts nor to conclude it with "git commit".

Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jay Soffian 2011-10-06 13:58:01 -04:00 committed by Junio C Hamano
parent 9fa8aecdeb
commit 82352cb633
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
builtin/revert.c
View file

@ -223,7 +223,7 @@ static void advise(const char *advice, ...)
va_end(params);
}
static void print_advice(void)
static void print_advice(int show_hint)
{
char *msg = getenv("GIT_CHERRY_PICK_HELP");
@ -238,9 +238,11 @@ static void print_advice(void)
return;
}
advise("after resolving the conflicts, mark the corrected paths");
advise("with 'git add <paths>' or 'git rm <paths>'");
advise("and commit the result with 'git commit'");
if (show_hint) {
advise("after resolving the conflicts, mark the corrected paths");
advise("with 'git add <paths>' or 'git rm <paths>'");
advise("and commit the result with 'git commit'");
}
}
static void write_message(struct strbuf *msgbuf, const char *filename)
@ -516,7 +518,7 @@ static int do_pick_commit(void)
: _("could not apply %s... %s"),
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
msg.subject);
print_advice();
print_advice(res == 1);
rerere(allow_rerere_auto);
} else {
if (!no_commit)