diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-12-14 11:57:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-12-14 15:39:54 -0800 |
| commit | 1eb1e9eea480059d4fba171e74a4375b8191e3f3 (patch) | |
| tree | 342a087ad1337f4e3f32315fc5c3c2423a0785e4 | |
| parent | 12a6d752fb61b10194b2897defb2b34e09099b12 (diff) | |
| download | git-1eb1e9eea480059d4fba171e74a4375b8191e3f3.tar.gz | |
commit: allow --amend to reuse message from another commit
After tentatively applying a patch from a contributor, you can get a
replacement patch with corrected code and unusable commit log message.
In such a case, this sequence ought to give you an editor based on the
message in the earlier commit, to let you describe an incremental
improvement:
git reset --hard HEAD^ ;# discard the earlier one
git am <corrected-patch
git commit --amend -c HEAD@{1}
Unfortunately, --amend insisted reusing the message from the commit
being amended, ignoring the -c option. This corrects it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-commit.c | 2 | ||||
| -rwxr-xr-x | t/t7501-commit.sh | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index ad9f9211b3..518ebe0347 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -537,7 +537,7 @@ static int parse_and_validate_options(int argc, const char *argv[], die("Option -m cannot be combined with -c/-C/-F."); if (edit_message) use_message = edit_message; - if (amend) + if (amend && !use_message) use_message = "HEAD"; if (use_message) { unsigned char sha1[20]; diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index 05aa97d6f3..d1a415a126 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -310,4 +310,21 @@ test_expect_success 'same tree (merge and amend merge)' ' ' +test_expect_success 'amend using the message from another commit' ' + + git reset --hard && + test_tick && + git commit --allow-empty -m "old commit" && + old=$(git rev-parse --verify HEAD) && + test_tick && + git commit --allow-empty -m "new commit" && + new=$(git rev-parse --verify HEAD) && + test_tick && + git commit --allow-empty --amend -C "$old" && + git show --pretty="format:%ad %s" "$old" >expected && + git show --pretty="format:%ad %s" HEAD >actual && + diff -u expected actual + +' + test_done |