From: "brian m. carlson" <sandals@crustytoothpaste.net>
To: Harald van Dijk via GitGitGadget <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org, Harald van Dijk <harald@gigawatt.nl>
Subject: Re: [PATCH] show_one_mergetag: print non-parent in hex form.
Date: Sun, 1 Mar 2020 02:01:19 +0000 [thread overview]
Message-ID: <20200301020119.GE9290@camp.crustytoothpaste.net> (raw)
In-Reply-To: <pull.568.git.1582981677312.gitgitgadget@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 1256 bytes --]
On 2020-02-29 at 13:07:57, Harald van Dijk via GitGitGadget wrote:
> From: Harald van Dijk <harald@gigawatt.nl>
>
> 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.
Seems like a good idea.
> +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
I appreciate you computing this value with git rev-parse.
--
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 263 bytes --]
next prev parent reply other threads:[~2020-03-01 2:01 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-29 13:07 [PATCH] show_one_mergetag: print non-parent in hex form Harald van Dijk via GitGitGadget
2020-03-01 2:01 ` brian m. carlson [this message]
2020-03-01 15:59 ` Martin Ågren
2020-03-01 20:25 ` Harald van Dijk
2020-03-02 19:17 ` Martin Ågren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200301020119.GE9290@camp.crustytoothpaste.net \
--to=sandals@crustytoothpaste.net \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=harald@gigawatt.nl \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).