aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-02-03 00:57:23 -0800
committerJunio C Hamano <gitster@pobox.com>2008-02-03 00:57:23 -0800
commitd8534adac756a71a897b3a433eaea7992a137b71 (patch)
tree2a1418ef780cd916426c6d143c336a4a62231c8f /t
parent991c3dc79f21a52209f9f41a52909cbb9462de1a (diff)
parent8a2f87332b847edc7f8fc5f305889c863651ecb5 (diff)
downloadgit-d8534adac756a71a897b3a433eaea7992a137b71.tar.gz
git-d8534adac756a71a897b3a433eaea7992a137b71.tar.xz
Merge branch 'maint'
* maint: Fix "git-commit -C $tag" Documentation/git-stash.txt: Adjust SYNOPSIS command syntax (2)
Diffstat (limited to 't')
-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 21dcf550f..361886c3d 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