diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-03 00:00:09 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-03 00:56:35 -0800 |
| commit | 8a2f87332b847edc7f8fc5f305889c863651ecb5 (patch) | |
| tree | 3767d83a79e9fe57dd93ada61c05ea5a9548af73 | |
| parent | 71bda8b923ed1bde7b831c6597af5a80213f6768 (diff) | |
| download | git-8a2f87332b847edc7f8fc5f305889c863651ecb5.tar.gz git-8a2f87332b847edc7f8fc5f305889c863651ecb5.tar.xz | |
Fix "git-commit -C $tag"
The scripted version might not have handled this correctly
either, but the version rewritten in C definitely does not grok
this and complains $tag is not a commit object.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-commit.c | 2 | ||||
| -rwxr-xr-x | t/t7501-commit.sh | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/builtin-commit.c b/builtin-commit.c index d8deb1ad0..c787bed69 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -601,7 +601,7 @@ static int parse_and_validate_options(int argc, const char *argv[], if (get_sha1(use_message, sha1)) die("could not lookup commit %s", use_message); - commit = lookup_commit(sha1); + commit = lookup_commit_reference(sha1); if (!commit || parse_commit(commit)) die("could not parse commit %s", use_message); diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh index d1a415a12..55043d102 100755 --- a/t/t7501-commit.sh +++ b/t/t7501-commit.sh @@ -327,4 +327,22 @@ test_expect_success 'amend using the message from another commit' ' ' +test_expect_success 'amend using the message from a commit named with tag' ' + + git reset --hard && + test_tick && + git commit --allow-empty -m "old commit" && + old=$(git rev-parse --verify HEAD) && + git tag -a -m "tag on old" tagged-old HEAD && + test_tick && + git commit --allow-empty -m "new commit" && + new=$(git rev-parse --verify HEAD) && + test_tick && + git commit --allow-empty --amend -C tagged-old && + git show --pretty="format:%ad %s" "$old" >expected && + git show --pretty="format:%ad %s" HEAD >actual && + diff -u expected actual + +' + test_done |