diff options
| author | Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-03-04 14:26:05 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-04 13:15:09 -0800 |
| commit | f52463a58275c8dd12b26b02bc0388d015547fcc (patch) | |
| tree | d189ddbeb7c8764033cff419d19592c9ab5fc724 | |
| parent | 9509af686bffdbd7c3f17faf3c07d2034d480ffc (diff) | |
| download | git-f52463a58275c8dd12b26b02bc0388d015547fcc.tar.gz git-f52463a58275c8dd12b26b02bc0388d015547fcc.tar.xz | |
cherry-pick: Suggest a better method to retain authorship
When a cherry-pick failed, we used to recommend setting environment
variables to retain the authorship. It is much easier, though, to use
the "-c" flag of git-commit.
Print this message also when merge-recursive fails (the code used to
exit(1) in that case, never reaching the proper failure path).
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
| -rw-r--r-- | builtin-revert.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/builtin-revert.c b/builtin-revert.c index bc3cfcba0..382fe0c6a 100644 --- a/builtin-revert.c +++ b/builtin-revert.c @@ -323,9 +323,8 @@ static int revert_or_cherry_pick(int argc, const char **argv) if (merge_recursive(sha1_to_hex(base->object.sha1), sha1_to_hex(head), "HEAD", - sha1_to_hex(next->object.sha1), oneline)) - exit(1); - if (write_tree(head, 0, NULL)) { + sha1_to_hex(next->object.sha1), oneline) || + write_tree(head, 0, NULL)) { const char *target = git_path("MERGE_MSG"); add_to_msg("\nConflicts:\n\n"); read_cache(); @@ -350,16 +349,10 @@ static int revert_or_cherry_pick(int argc, const char **argv) "mark the corrected paths with 'git-add <paths>'\n" "and commit the result.\n", me); if (action == CHERRY_PICK) { - fprintf(stderr, "You may choose to use the following " - "when making the commit:\n" - "GIT_AUTHOR_NAME=\"%s\"\n", - getenv("GIT_AUTHOR_NAME")); - fprintf(stderr, "GIT_AUTHOR_EMAIL=\"%s\"\n", - getenv("GIT_AUTHOR_EMAIL")); - fprintf(stderr, "GIT_AUTHOR_DATE=\"%s\"\n" - "export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL " - "GIT_AUTHOR_DATE\n", - getenv("GIT_AUTHOR_DATE")); + fprintf(stderr, "When commiting, use the option " + "'-c %s' to retain authorship and message.\n", + find_unique_abbrev(commit->object.sha1, + DEFAULT_ABBREV)); } exit(1); } |