diff options
| author |  Jay Soffian <jaysoffian@gmail.com> | 2011-02-19 23:12:27 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-02-21 22:58:02 -0800 |
| commit | d7e5c0cbfb0421d8a609f1125267dbad73069410 (patch) | |
| tree | 7b19c3c4182cdbf42d260f4da024c2774718c6b0 /builtin/commit.c | |
| parent | t3507: introduce pristine-detach helper (diff) | |
| download | tgif-d7e5c0cbfb0421d8a609f1125267dbad73069410.tar.xz | |
Introduce CHERRY_PICK_HEAD
When a cherry-pick conflicts git advises:
$ git commit -c <original commit id>
to preserve the original commit message and authorship. Instead, let's
record the original commit id in CHERRY_PICK_HEAD and advise:
$ git commit -c CHERRY_PICK_HEAD
A later patch teaches git to handle the '-c CHERRY_PICK_HEAD' part.
Note that we record CHERRY_PICK_HEAD even in the case where there
are no conflicts so that we may use it to communicate authorship to
commit; this will then allow us to remove set_author_ident_env from
revert.c. However, we do not record CHERRY_PICK_HEAD when --no-commit
is used, as presumably the user intends to further edit the commit
and possibly even cherry-pick additional commits on top.
Tests and documentation contributed by Jonathan Nieder.
Reviewed-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Jay Soffian <jaysoffian@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/commit.c')
| -rw-r--r-- | builtin/commit.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/commit.c b/builtin/commit.c index 03cff5af63..0def5401ab 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -1424,6 +1424,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix) die("cannot update HEAD ref"); } + unlink(git_path("CHERRY_PICK_HEAD")); unlink(git_path("MERGE_HEAD")); unlink(git_path("MERGE_MSG")); unlink(git_path("MERGE_MODE")); |