diff options
| author | Harald van Dijk <harald@gigawatt.nl> | 2020-02-29 13:07:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-03-02 20:34:00 (GMT) |
| commit | 237a28173feffc9bdec5aa669aa17fba1ac7c279 (patch) | |
| tree | b1733ece07384ae88acf34c6bf89599a3792b5c1 | |
| parent | d9589d4051537c387b70dc76e430c61b4c85a86d (diff) | |
| download | git-237a28173feffc9bdec5aa669aa17fba1ac7c279.zip git-237a28173feffc9bdec5aa669aa17fba1ac7c279.tar.gz git-237a28173feffc9bdec5aa669aa17fba1ac7c279.tar.bz2 | |
show_one_mergetag: print non-parent in hex form.
When a mergetag names a non-parent, which can occur after a shallow
clone, its hash was previously printed as raw data. Print it in hex form
instead.
Signed-off-by: Harald van Dijk <harald@gigawatt.nl>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | log-tree.c | 2 | ||||
| -rwxr-xr-x | t/t4202-log.sh | 20 |
2 files changed, 21 insertions, 1 deletions
@@ -514,7 +514,7 @@ static int show_one_mergetag(struct commit *commit, "merged tag '%s'\n", tag->tag); else if ((nth = which_parent(&tag->tagged->oid, commit)) < 0) strbuf_addf(&verify_message, "tag %s names a non-parent %s\n", - tag->tag, tag->tagged->oid.hash); + tag->tag, oid_to_hex(&tag->tagged->oid)); else strbuf_addf(&verify_message, "parent #%d, tagged '%s'\n", nth + 1, tag->tag); diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 819c24d..eecac18 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -1596,6 +1596,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 && |