summaryrefslogtreecommitdiff
path: root/t/t4202-log.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-03-09 18:21:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-03-09 18:21:21 (GMT)
commit3658d77f8e563e77658d9e44df5e24f08ca99e3a (patch)
tree70c8cd2800aedabf607827d6b4f87a66d0fa6133 /t/t4202-log.sh
parent6125104b88e8bb0539b5d8a43bd0788922402724 (diff)
parent237a28173feffc9bdec5aa669aa17fba1ac7c279 (diff)
downloadgit-3658d77f8e563e77658d9e44df5e24f08ca99e3a.zip
git-3658d77f8e563e77658d9e44df5e24f08ca99e3a.tar.gz
git-3658d77f8e563e77658d9e44df5e24f08ca99e3a.tar.bz2
Merge branch 'hd/show-one-mergetag-fix'
"git show" and others gave an object name in raw format in its error output, which has been corrected to give it in hex. * hd/show-one-mergetag-fix: show_one_mergetag: print non-parent in hex form.
Diffstat (limited to 't/t4202-log.sh')
-rwxr-xr-xt/t4202-log.sh20
1 files changed, 20 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 4694b6d..0f766ba 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -1607,6 +1607,26 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
grep "^| | gpg: Good signature" actual
'
+test_expect_success GPG 'log --graph --show-signature for merged tag in shallow clone' '
+ test_when_finished "git reset --hard && git checkout master" &&
+ git checkout -b plain-shallow master &&
+ echo aaa >bar &&
+ git add bar &&
+ git commit -m bar_commit &&
+ git checkout --detach master &&
+ echo bbb >baz &&
+ git add baz &&
+ git commit -m baz_commit &&
+ git tag -s -m signed_tag_msg signed_tag_shallow &&
+ hash=$(git rev-parse HEAD) &&
+ git checkout plain-shallow &&
+ git merge --no-ff -m msg signed_tag_shallow &&
+ git clone --depth 1 --no-local . shallow &&
+ test_when_finished "rm -rf shallow" &&
+ git -C shallow log --graph --show-signature -n1 plain-shallow >actual &&
+ grep "tag signed_tag_shallow names a non-parent $hash" actual
+'
+
test_expect_success GPGSM 'log --graph --show-signature for merged tag x509' '
test_when_finished "git reset --hard && git checkout master" &&
test_config gpg.format x509 &&