mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Merge branch 'jn/cherry-revert-message-clean-up'
* jn/cherry-revert-message-clean-up: tests: fix syntax error in "Use advise() for hints" test cherry-pick/revert: Use advise() for hints cherry-pick/revert: Use error() for failure message Introduce advise() to print hints Eliminate “Finished cherry-pick/revert” message t3508: add check_head_differs_from() helper function and use it revert: improve success message by adding abbreviated commit sha1 revert: don't print "Finished one cherry-pick." if commit failed revert: refactor commit code into a new run_git_commit() function revert: report success when using option --strategy
This commit is contained in:
commit
ae76cb90cb
|
@ -112,25 +112,19 @@ $ git tag pu-anchor pu
|
|||
$ git rebase master
|
||||
* Applying: Redo "revert" using three-way merge machinery.
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Finished one cherry-pick.
|
||||
* Applying: Remove git-apply-patch-script.
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Simple cherry-pick fails; trying Automatic cherry-pick.
|
||||
Removing Documentation/git-apply-patch-script.txt
|
||||
Removing git-apply-patch-script
|
||||
Finished one cherry-pick.
|
||||
* Applying: Document "git cherry-pick" and "git revert"
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Finished one cherry-pick.
|
||||
* Applying: mailinfo and applymbox updates
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Finished one cherry-pick.
|
||||
* Applying: Show commits in topo order and name all commits.
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Finished one cherry-pick.
|
||||
* Applying: More documentation updates.
|
||||
First trying simple merge strategy to cherry-pick.
|
||||
Finished one cherry-pick.
|
||||
------------------------------------------------
|
||||
|
||||
The temporary tag 'pu-anchor' is me just being careful, in case 'git
|
||||
|
|
143
builtin/revert.c
143
builtin/revert.c
|
@ -231,27 +231,30 @@ static void set_author_ident_env(const char *message)
|
|||
sha1_to_hex(commit->object.sha1));
|
||||
}
|
||||
|
||||
static char *help_msg(void)
|
||||
static void advise(const char *advice, ...)
|
||||
{
|
||||
va_list params;
|
||||
|
||||
va_start(params, advice);
|
||||
vreportf("hint: ", advice, params);
|
||||
va_end(params);
|
||||
}
|
||||
|
||||
static void print_advice(void)
|
||||
{
|
||||
struct strbuf helpbuf = STRBUF_INIT;
|
||||
char *msg = getenv("GIT_CHERRY_PICK_HELP");
|
||||
|
||||
if (msg)
|
||||
return msg;
|
||||
|
||||
strbuf_addstr(&helpbuf, " After resolving the conflicts,\n"
|
||||
"mark the corrected paths with 'git add <paths>' or 'git rm <paths>'\n"
|
||||
"and commit the result");
|
||||
|
||||
if (action == CHERRY_PICK) {
|
||||
strbuf_addf(&helpbuf, " with: \n"
|
||||
"\n"
|
||||
" git commit -c %s\n",
|
||||
sha1_to_hex(commit->object.sha1));
|
||||
if (msg) {
|
||||
fprintf(stderr, "%s\n", msg);
|
||||
return;
|
||||
}
|
||||
else
|
||||
strbuf_addch(&helpbuf, '.');
|
||||
return strbuf_detach(&helpbuf, NULL);
|
||||
|
||||
advise("after resolving the conflicts, mark the corrected paths");
|
||||
advise("with 'git add <paths>' or 'git rm <paths>'");
|
||||
|
||||
if (action == CHERRY_PICK)
|
||||
advise("and commit the result with 'git commit -c %s'",
|
||||
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV));
|
||||
}
|
||||
|
||||
static void write_message(struct strbuf *msgbuf, const char *filename)
|
||||
|
@ -301,10 +304,9 @@ static int fast_forward_to(const unsigned char *to, const unsigned char *from)
|
|||
return write_ref_sha1(ref_lock, to, "cherry-pick");
|
||||
}
|
||||
|
||||
static void do_recursive_merge(struct commit *base, struct commit *next,
|
||||
const char *base_label, const char *next_label,
|
||||
unsigned char *head, struct strbuf *msgbuf,
|
||||
char *defmsg)
|
||||
static int do_recursive_merge(struct commit *base, struct commit *next,
|
||||
const char *base_label, const char *next_label,
|
||||
unsigned char *head, struct strbuf *msgbuf)
|
||||
{
|
||||
struct merge_options o;
|
||||
struct tree *result, *next_tree, *base_tree, *head_tree;
|
||||
|
@ -347,14 +349,35 @@ static void do_recursive_merge(struct commit *base, struct commit *next,
|
|||
i++;
|
||||
}
|
||||
}
|
||||
write_message(msgbuf, defmsg);
|
||||
fprintf(stderr, "Automatic %s failed.%s\n",
|
||||
me, help_msg());
|
||||
rerere(allow_rerere_auto);
|
||||
exit(1);
|
||||
}
|
||||
write_message(msgbuf, defmsg);
|
||||
fprintf(stderr, "Finished one %s.\n", me);
|
||||
|
||||
return !clean;
|
||||
}
|
||||
|
||||
/*
|
||||
* If we are cherry-pick, and if the merge did not result in
|
||||
* hand-editing, we will hit this commit and inherit the original
|
||||
* author date and name.
|
||||
* If we are revert, or if our cherry-pick results in a hand merge,
|
||||
* we had better say that the current user is responsible for that.
|
||||
*/
|
||||
static int run_git_commit(const char *defmsg)
|
||||
{
|
||||
/* 6 is max possible length of our args array including NULL */
|
||||
const char *args[6];
|
||||
int i = 0;
|
||||
|
||||
args[i++] = "commit";
|
||||
args[i++] = "-n";
|
||||
if (signoff)
|
||||
args[i++] = "-s";
|
||||
if (!edit) {
|
||||
args[i++] = "-F";
|
||||
args[i++] = defmsg;
|
||||
}
|
||||
args[i] = NULL;
|
||||
|
||||
return run_command_v_opt(args, RUN_GIT_CMD);
|
||||
}
|
||||
|
||||
static int do_pick_commit(void)
|
||||
|
@ -365,6 +388,7 @@ static int do_pick_commit(void)
|
|||
struct commit_message msg = { NULL, NULL, NULL, NULL, NULL };
|
||||
char *defmsg = NULL;
|
||||
struct strbuf msgbuf = STRBUF_INIT;
|
||||
int res;
|
||||
|
||||
if (no_commit) {
|
||||
/*
|
||||
|
@ -460,63 +484,40 @@ static int do_pick_commit(void)
|
|||
}
|
||||
}
|
||||
|
||||
if (!strategy || !strcmp(strategy, "recursive") || action == REVERT)
|
||||
do_recursive_merge(base, next, base_label, next_label,
|
||||
head, &msgbuf, defmsg);
|
||||
else {
|
||||
int res;
|
||||
if (!strategy || !strcmp(strategy, "recursive") || action == REVERT) {
|
||||
res = do_recursive_merge(base, next, base_label, next_label,
|
||||
head, &msgbuf);
|
||||
write_message(&msgbuf, defmsg);
|
||||
} else {
|
||||
struct commit_list *common = NULL;
|
||||
struct commit_list *remotes = NULL;
|
||||
|
||||
write_message(&msgbuf, defmsg);
|
||||
|
||||
commit_list_insert(base, &common);
|
||||
commit_list_insert(next, &remotes);
|
||||
res = try_merge_command(strategy, common,
|
||||
sha1_to_hex(head), remotes);
|
||||
free_commit_list(common);
|
||||
free_commit_list(remotes);
|
||||
if (res) {
|
||||
fprintf(stderr, "Automatic %s with strategy %s failed.%s\n",
|
||||
me, strategy, help_msg());
|
||||
rerere(allow_rerere_auto);
|
||||
exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
if (res) {
|
||||
error("could not %s %s... %s",
|
||||
action == REVERT ? "revert" : "apply",
|
||||
find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV),
|
||||
msg.subject);
|
||||
print_advice();
|
||||
rerere(allow_rerere_auto);
|
||||
} else {
|
||||
if (!no_commit)
|
||||
res = run_git_commit(defmsg);
|
||||
}
|
||||
|
||||
free_message(&msg);
|
||||
|
||||
/*
|
||||
*
|
||||
* If we are cherry-pick, and if the merge did not result in
|
||||
* hand-editing, we will hit this commit and inherit the original
|
||||
* author date and name.
|
||||
* If we are revert, or if our cherry-pick results in a hand merge,
|
||||
* we had better say that the current user is responsible for that.
|
||||
*/
|
||||
|
||||
if (!no_commit) {
|
||||
/* 6 is max possible length of our args array including NULL */
|
||||
const char *args[6];
|
||||
int res;
|
||||
int i = 0;
|
||||
|
||||
args[i++] = "commit";
|
||||
args[i++] = "-n";
|
||||
if (signoff)
|
||||
args[i++] = "-s";
|
||||
if (!edit) {
|
||||
args[i++] = "-F";
|
||||
args[i++] = defmsg;
|
||||
}
|
||||
args[i] = NULL;
|
||||
res = run_command_v_opt(args, RUN_GIT_CMD);
|
||||
free(defmsg);
|
||||
|
||||
return res;
|
||||
}
|
||||
|
||||
free(defmsg);
|
||||
|
||||
return 0;
|
||||
return res;
|
||||
}
|
||||
|
||||
static void prepare_revs(struct rev_info *revs)
|
||||
|
|
|
@ -181,7 +181,6 @@ Conflicts:
|
|||
esac
|
||||
exit 1
|
||||
}
|
||||
echo >&2 "Finished one $me."
|
||||
|
||||
# If we are cherry-pick, and if the merge did not result in
|
||||
# hand-editing, we will hit this commit and inherit the original
|
||||
|
|
|
@ -114,9 +114,9 @@ AUTOSQUASH=
|
|||
test "$(git config --bool rebase.autosquash)" = "true" && AUTOSQUASH=t
|
||||
NEVER_FF=
|
||||
|
||||
GIT_CHERRY_PICK_HELP=" After resolving the conflicts,
|
||||
mark the corrected paths with 'git add <paths>', and
|
||||
run 'git rebase --continue'"
|
||||
GIT_CHERRY_PICK_HELP="\
|
||||
hint: after resolving the conflicts, mark the corrected paths
|
||||
hint: with 'git add <paths>' and run 'git rebase --continue'"
|
||||
export GIT_CHERRY_PICK_HELP
|
||||
|
||||
warn () {
|
||||
|
|
|
@ -38,6 +38,26 @@ test_expect_success 'failed cherry-pick does not advance HEAD' '
|
|||
test "$head" = "$newhead"
|
||||
'
|
||||
|
||||
test_expect_success 'advice from failed cherry-pick' "
|
||||
git checkout -f initial^0 &&
|
||||
git read-tree -u --reset HEAD &&
|
||||
git clean -d -f -f -q -x &&
|
||||
|
||||
git update-index --refresh &&
|
||||
git diff-index --exit-code HEAD &&
|
||||
|
||||
picked=\$(git rev-parse --short picked) &&
|
||||
cat <<-EOF >expected &&
|
||||
error: could not apply \$picked... picked
|
||||
hint: after resolving the conflicts, mark the corrected paths
|
||||
hint: with 'git add <paths>' or 'git rm <paths>'
|
||||
hint: and commit the result with 'git commit -c \$picked'
|
||||
EOF
|
||||
test_must_fail git cherry-pick picked 2>actual &&
|
||||
|
||||
test_cmp expected actual
|
||||
"
|
||||
|
||||
test_expect_success 'failed cherry-pick produces dirty index' '
|
||||
|
||||
git checkout -f initial^0 &&
|
||||
|
|
|
@ -4,6 +4,18 @@ test_description='test cherry-picking many commits'
|
|||
|
||||
. ./test-lib.sh
|
||||
|
||||
check_head_differs_from() {
|
||||
head=$(git rev-parse --verify HEAD) &&
|
||||
arg=$(git rev-parse --verify "$1") &&
|
||||
test "$head" != "$arg"
|
||||
}
|
||||
|
||||
check_head_equals() {
|
||||
head=$(git rev-parse --verify HEAD) &&
|
||||
arg=$(git rev-parse --verify "$1") &&
|
||||
test "$head" = "$arg"
|
||||
}
|
||||
|
||||
test_expect_success setup '
|
||||
echo first > file1 &&
|
||||
git add file1 &&
|
||||
|
@ -23,13 +35,55 @@ test_expect_success setup '
|
|||
'
|
||||
|
||||
test_expect_success 'cherry-pick first..fourth works' '
|
||||
cat <<-\EOF >expected &&
|
||||
[master OBJID] second
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
[master OBJID] third
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
[master OBJID] fourth
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
EOF
|
||||
|
||||
git checkout -f master &&
|
||||
git reset --hard first &&
|
||||
test_tick &&
|
||||
git cherry-pick first..fourth &&
|
||||
git cherry-pick first..fourth >actual &&
|
||||
git diff --quiet other &&
|
||||
git diff --quiet HEAD other &&
|
||||
test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify fourth)"
|
||||
|
||||
sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
|
||||
test_cmp expected actual.fuzzy &&
|
||||
check_head_differs_from fourth
|
||||
'
|
||||
|
||||
test_expect_success 'cherry-pick --strategy resolve first..fourth works' '
|
||||
cat <<-\EOF >expected &&
|
||||
Trying simple merge.
|
||||
[master OBJID] second
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
Trying simple merge.
|
||||
[master OBJID] third
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
Trying simple merge.
|
||||
[master OBJID] fourth
|
||||
Author: A U Thor <author@example.com>
|
||||
1 files changed, 1 insertions(+), 0 deletions(-)
|
||||
EOF
|
||||
|
||||
git checkout -f master &&
|
||||
git reset --hard first &&
|
||||
test_tick &&
|
||||
git cherry-pick --strategy resolve first..fourth >actual &&
|
||||
git diff --quiet other &&
|
||||
git diff --quiet HEAD other &&
|
||||
sed -e "s/$_x05[0-9a-f][0-9a-f]/OBJID/" <actual >actual.fuzzy &&
|
||||
test_cmp expected actual.fuzzy &&
|
||||
check_head_differs_from fourth
|
||||
'
|
||||
|
||||
test_expect_success 'cherry-pick --ff first..fourth works' '
|
||||
|
@ -39,7 +93,7 @@ test_expect_success 'cherry-pick --ff first..fourth works' '
|
|||
git cherry-pick --ff first..fourth &&
|
||||
git diff --quiet other &&
|
||||
git diff --quiet HEAD other &&
|
||||
test "$(git rev-parse --verify HEAD)" = "$(git rev-parse --verify fourth)"
|
||||
check_head_equals fourth
|
||||
'
|
||||
|
||||
test_expect_success 'cherry-pick -n first..fourth works' '
|
||||
|
@ -89,7 +143,7 @@ test_expect_success 'cherry-pick -3 fourth works' '
|
|||
git cherry-pick -3 fourth &&
|
||||
git diff --quiet other &&
|
||||
git diff --quiet HEAD other &&
|
||||
test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify fourth)"
|
||||
check_head_differs_from fourth
|
||||
'
|
||||
|
||||
test_expect_success 'cherry-pick --stdin works' '
|
||||
|
@ -99,7 +153,7 @@ test_expect_success 'cherry-pick --stdin works' '
|
|||
git rev-list --reverse first..fourth | git cherry-pick --stdin &&
|
||||
git diff --quiet other &&
|
||||
git diff --quiet HEAD other &&
|
||||
test "$(git rev-parse --verify HEAD)" != "$(git rev-parse --verify fourth)"
|
||||
check_head_differs_from fourth
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue