Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-03 11:00:09 +0300
committerJunio C Hamano <gitster@pobox.com>2008-02-03 11:56:35 +0300
commit8a2f87332b847edc7f8fc5f305889c863651ecb5 (patch)
tree3767d83a79e9fe57dd93ada61c05ea5a9548af73 /t/t7501-commit.sh
parent71bda8b923ed1bde7b831c6597af5a80213f6768 (diff)
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>
Diffstat (limited to 't/t7501-commit.sh')
-rwxr-xr-xt/t7501-commit.sh18
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t7501-commit.sh b/t/t7501-commit.sh
index d1a415a126..55043d102f 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