mirror of
https://github.com/git/git
synced 2024-09-13 05:14:36 +00:00
b01e1c7ef0
When ref-filter is asked to show %(content:subject), etc, we end up in
find_subpos() to parse out the three major parts: the subject, the body,
and the signature (if any).
When searching for the blank line between the subject and body, if we
don't find anything, we try to treat the whole message as the subject,
with no body. But our idea of "the whole message" needs to take into
account the signature, too. Since 9f75ce3d8f (ref-filter: handle CRLF at
end-of-line more gracefully, 2020-10-29), the code instead goes all the
way to the end of the buffer, which produces confusing output.
Here's an example. If we have a tag message like this:
this is the subject
-----BEGIN SSH SIGNATURE-----
...some stuff...
-----END SSH SIGNATURE-----
then the current parser will put the start of the body at the end of the
whole buffer. This produces two buggy outcomes:
- since the subject length is computed as (body - subject), showing
%(contents:subject) will print both the subject and the signature,
rather than just the single line
- since the body length is computed as (sig - body), and the body now
starts _after_ the signature, we end up with a negative length!
Fortunately we never access out-of-bounds memory, because the
negative length is fed to xmemdupz(), which casts it to a size_t,
and xmalloc() bails trying to allocate an absurdly large value.
In theory it would be possible for somebody making a malicious tag
to wrap it around to a more reasonable value, but it would require a
tag on the order of 2^63 bytes. And even if they did, all they get
is an out of bounds string read. So the security implications are
probably not interesting.
We can fix both by correctly putting the start of the body at the same
index as the start of the signature (effectively making the body empty).
Note that this is a real issue with signatures generated with gpg.format
set to "ssh", which would look like the example above. In the new tests
here I use a hard-coded tag message, for a few reasons:
- regardless of what the ssh-signing code produces now or in the
future, we should be testing this particular case
- skipping the actual signature makes the tests simpler to write (and
allows them to run on more systems)
- t6300 has helpers for working with gpg signatures; for the purposes
of this bug, "BEGIN PGP" is just as good a demonstration, and this
simplifies the tests
Curiously, the same issue doesn't happen with real gpg signatures (and
there are even existing tests in t6300 with cover this). Those have a
blank line between the header and the content, like:
this is the subject
-----BEGIN PGP SIGNATURE-----
...some stuff...
-----END PGP SIGNATURE-----
Because we search for the subject/body separator line with a strstr(),
we find the blank line in the signature, even though it's outside of
what we'd consider the body. But that puts us unto a separate code path,
which realizes that we're now in the signature and adjusts the line back
to "sigstart". So this patch is basically just making the "no line found
at all" case match that. And note that "sigstart" is always defined (if
there is no signature, it points to the end of the buffer as you'd
expect).
Reported-by: Martin Englund <martin@englund.nu>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
1425 lines
44 KiB
Bash
Executable file
1425 lines
44 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2007 Andy Parkins
|
|
#
|
|
|
|
test_description='for-each-ref test'
|
|
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-gpg.sh
|
|
. "$TEST_DIRECTORY"/lib-terminal.sh
|
|
|
|
# Mon Jul 3 23:18:43 2006 +0000
|
|
datestamp=1151968723
|
|
setdate_and_increment () {
|
|
GIT_COMMITTER_DATE="$datestamp +0200"
|
|
datestamp=$(expr "$datestamp" + 1)
|
|
GIT_AUTHOR_DATE="$datestamp +0200"
|
|
datestamp=$(expr "$datestamp" + 1)
|
|
export GIT_COMMITTER_DATE GIT_AUTHOR_DATE
|
|
}
|
|
|
|
test_expect_success setup '
|
|
test_oid_cache <<-EOF &&
|
|
disklen sha1:138
|
|
disklen sha256:154
|
|
EOF
|
|
setdate_and_increment &&
|
|
echo "Using $datestamp" > one &&
|
|
git add one &&
|
|
git commit -m "Initial" &&
|
|
git branch -M main &&
|
|
setdate_and_increment &&
|
|
git tag -a -m "Tagging at $datestamp" testtag &&
|
|
git update-ref refs/remotes/origin/main main &&
|
|
git remote add origin nowhere &&
|
|
git config branch.main.remote origin &&
|
|
git config branch.main.merge refs/heads/main &&
|
|
git remote add myfork elsewhere &&
|
|
git config remote.pushdefault myfork &&
|
|
git config push.default current
|
|
'
|
|
|
|
test_atom() {
|
|
case "$1" in
|
|
head) ref=refs/heads/main ;;
|
|
tag) ref=refs/tags/testtag ;;
|
|
sym) ref=refs/heads/sym ;;
|
|
*) ref=$1 ;;
|
|
esac
|
|
printf '%s\n' "$3" >expected
|
|
test_expect_${4:-success} $PREREQ "basic atom: $1 $2" "
|
|
git for-each-ref --format='%($2)' $ref >actual &&
|
|
sanitize_pgp <actual >actual.clean &&
|
|
test_cmp expected actual.clean
|
|
"
|
|
# Automatically test "contents:size" atom after testing "contents"
|
|
if test "$2" = "contents"
|
|
then
|
|
# for commit leg, $3 is changed there
|
|
expect=$(printf '%s' "$3" | wc -c)
|
|
test_expect_${4:-success} $PREREQ "basic atom: $1 contents:size" '
|
|
type=$(git cat-file -t "$ref") &&
|
|
case $type in
|
|
tag)
|
|
# We cannot use $3 as it expects sanitize_pgp to run
|
|
git cat-file tag $ref >out &&
|
|
expect=$(tail -n +6 out | wc -c) &&
|
|
rm -f out ;;
|
|
tree | blob)
|
|
expect="" ;;
|
|
commit)
|
|
: "use the calculated expect" ;;
|
|
*)
|
|
BUG "unknown object type" ;;
|
|
esac &&
|
|
# Leave $expect unquoted to lose possible leading whitespaces
|
|
echo $expect >expected &&
|
|
git for-each-ref --format="%(contents:size)" "$ref" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
fi
|
|
}
|
|
|
|
hexlen=$(test_oid hexsz)
|
|
disklen=$(test_oid disklen)
|
|
|
|
test_atom head refname refs/heads/main
|
|
test_atom head refname: refs/heads/main
|
|
test_atom head refname:short main
|
|
test_atom head refname:lstrip=1 heads/main
|
|
test_atom head refname:lstrip=2 main
|
|
test_atom head refname:lstrip=-1 main
|
|
test_atom head refname:lstrip=-2 heads/main
|
|
test_atom head refname:rstrip=1 refs/heads
|
|
test_atom head refname:rstrip=2 refs
|
|
test_atom head refname:rstrip=-1 refs
|
|
test_atom head refname:rstrip=-2 refs/heads
|
|
test_atom head refname:strip=1 heads/main
|
|
test_atom head refname:strip=2 main
|
|
test_atom head refname:strip=-1 main
|
|
test_atom head refname:strip=-2 heads/main
|
|
test_atom head upstream refs/remotes/origin/main
|
|
test_atom head upstream:short origin/main
|
|
test_atom head upstream:lstrip=2 origin/main
|
|
test_atom head upstream:lstrip=-2 origin/main
|
|
test_atom head upstream:rstrip=2 refs/remotes
|
|
test_atom head upstream:rstrip=-2 refs/remotes
|
|
test_atom head upstream:strip=2 origin/main
|
|
test_atom head upstream:strip=-2 origin/main
|
|
test_atom head push refs/remotes/myfork/main
|
|
test_atom head push:short myfork/main
|
|
test_atom head push:lstrip=1 remotes/myfork/main
|
|
test_atom head push:lstrip=-1 main
|
|
test_atom head push:rstrip=1 refs/remotes/myfork
|
|
test_atom head push:rstrip=-1 refs
|
|
test_atom head push:strip=1 remotes/myfork/main
|
|
test_atom head push:strip=-1 main
|
|
test_atom head objecttype commit
|
|
test_atom head objectsize $((131 + hexlen))
|
|
test_atom head objectsize:disk $disklen
|
|
test_atom head deltabase $ZERO_OID
|
|
test_atom head objectname $(git rev-parse refs/heads/main)
|
|
test_atom head objectname:short $(git rev-parse --short refs/heads/main)
|
|
test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/main)
|
|
test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/main)
|
|
test_atom head tree $(git rev-parse refs/heads/main^{tree})
|
|
test_atom head tree:short $(git rev-parse --short refs/heads/main^{tree})
|
|
test_atom head tree:short=1 $(git rev-parse --short=1 refs/heads/main^{tree})
|
|
test_atom head tree:short=10 $(git rev-parse --short=10 refs/heads/main^{tree})
|
|
test_atom head parent ''
|
|
test_atom head parent:short ''
|
|
test_atom head parent:short=1 ''
|
|
test_atom head parent:short=10 ''
|
|
test_atom head numparent 0
|
|
test_atom head object ''
|
|
test_atom head type ''
|
|
test_atom head raw "$(git cat-file commit refs/heads/main)
|
|
"
|
|
test_atom head '*objectname' ''
|
|
test_atom head '*objecttype' ''
|
|
test_atom head author 'A U Thor <author@example.com> 1151968724 +0200'
|
|
test_atom head authorname 'A U Thor'
|
|
test_atom head authoremail '<author@example.com>'
|
|
test_atom head authoremail:trim 'author@example.com'
|
|
test_atom head authoremail:localpart 'author'
|
|
test_atom head authordate 'Tue Jul 4 01:18:44 2006 +0200'
|
|
test_atom head committer 'C O Mitter <committer@example.com> 1151968723 +0200'
|
|
test_atom head committername 'C O Mitter'
|
|
test_atom head committeremail '<committer@example.com>'
|
|
test_atom head committeremail:trim 'committer@example.com'
|
|
test_atom head committeremail:localpart 'committer'
|
|
test_atom head committerdate 'Tue Jul 4 01:18:43 2006 +0200'
|
|
test_atom head tag ''
|
|
test_atom head tagger ''
|
|
test_atom head taggername ''
|
|
test_atom head taggeremail ''
|
|
test_atom head taggeremail:trim ''
|
|
test_atom head taggeremail:localpart ''
|
|
test_atom head taggerdate ''
|
|
test_atom head creator 'C O Mitter <committer@example.com> 1151968723 +0200'
|
|
test_atom head creatordate 'Tue Jul 4 01:18:43 2006 +0200'
|
|
test_atom head subject 'Initial'
|
|
test_atom head subject:sanitize 'Initial'
|
|
test_atom head contents:subject 'Initial'
|
|
test_atom head body ''
|
|
test_atom head contents:body ''
|
|
test_atom head contents:signature ''
|
|
test_atom head contents 'Initial
|
|
'
|
|
test_atom head HEAD '*'
|
|
|
|
test_atom tag refname refs/tags/testtag
|
|
test_atom tag refname:short testtag
|
|
test_atom tag upstream ''
|
|
test_atom tag push ''
|
|
test_atom tag objecttype tag
|
|
test_atom tag objectsize $((114 + hexlen))
|
|
test_atom tag objectsize:disk $disklen
|
|
test_atom tag '*objectsize:disk' $disklen
|
|
test_atom tag deltabase $ZERO_OID
|
|
test_atom tag '*deltabase' $ZERO_OID
|
|
test_atom tag objectname $(git rev-parse refs/tags/testtag)
|
|
test_atom tag objectname:short $(git rev-parse --short refs/tags/testtag)
|
|
test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/main)
|
|
test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/main)
|
|
test_atom tag tree ''
|
|
test_atom tag tree:short ''
|
|
test_atom tag tree:short=1 ''
|
|
test_atom tag tree:short=10 ''
|
|
test_atom tag parent ''
|
|
test_atom tag parent:short ''
|
|
test_atom tag parent:short=1 ''
|
|
test_atom tag parent:short=10 ''
|
|
test_atom tag numparent ''
|
|
test_atom tag object $(git rev-parse refs/tags/testtag^0)
|
|
test_atom tag type 'commit'
|
|
test_atom tag '*objectname' $(git rev-parse refs/tags/testtag^{})
|
|
test_atom tag '*objecttype' 'commit'
|
|
test_atom tag author ''
|
|
test_atom tag authorname ''
|
|
test_atom tag authoremail ''
|
|
test_atom tag authoremail:trim ''
|
|
test_atom tag authoremail:localpart ''
|
|
test_atom tag authordate ''
|
|
test_atom tag committer ''
|
|
test_atom tag committername ''
|
|
test_atom tag committeremail ''
|
|
test_atom tag committeremail:trim ''
|
|
test_atom tag committeremail:localpart ''
|
|
test_atom tag committerdate ''
|
|
test_atom tag tag 'testtag'
|
|
test_atom tag tagger 'C O Mitter <committer@example.com> 1151968725 +0200'
|
|
test_atom tag taggername 'C O Mitter'
|
|
test_atom tag taggeremail '<committer@example.com>'
|
|
test_atom tag taggeremail:trim 'committer@example.com'
|
|
test_atom tag taggeremail:localpart 'committer'
|
|
test_atom tag taggerdate 'Tue Jul 4 01:18:45 2006 +0200'
|
|
test_atom tag creator 'C O Mitter <committer@example.com> 1151968725 +0200'
|
|
test_atom tag creatordate 'Tue Jul 4 01:18:45 2006 +0200'
|
|
test_atom tag subject 'Tagging at 1151968727'
|
|
test_atom tag subject:sanitize 'Tagging-at-1151968727'
|
|
test_atom tag contents:subject 'Tagging at 1151968727'
|
|
test_atom tag body ''
|
|
test_atom tag contents:body ''
|
|
test_atom tag contents:signature ''
|
|
test_atom tag contents 'Tagging at 1151968727
|
|
'
|
|
test_atom tag HEAD ' '
|
|
|
|
test_expect_success 'basic atom: refs/tags/testtag *raw' '
|
|
git cat-file commit refs/tags/testtag^{} >expected &&
|
|
git for-each-ref --format="%(*raw)" refs/tags/testtag >actual &&
|
|
sanitize_pgp <expected >expected.clean &&
|
|
echo >>expected.clean &&
|
|
sanitize_pgp <actual >actual.clean &&
|
|
test_cmp expected.clean actual.clean
|
|
'
|
|
|
|
test_expect_success 'Check invalid atoms names are errors' '
|
|
test_must_fail git for-each-ref --format="%(INVALID)" refs/heads
|
|
'
|
|
|
|
test_expect_success 'Check format specifiers are ignored in naming date atoms' '
|
|
git for-each-ref --format="%(authordate)" refs/heads &&
|
|
git for-each-ref --format="%(authordate:default) %(authordate)" refs/heads &&
|
|
git for-each-ref --format="%(authordate) %(authordate:default)" refs/heads &&
|
|
git for-each-ref --format="%(authordate:default) %(authordate:default)" refs/heads
|
|
'
|
|
|
|
test_expect_success 'Check valid format specifiers for date fields' '
|
|
git for-each-ref --format="%(authordate:default)" refs/heads &&
|
|
git for-each-ref --format="%(authordate:relative)" refs/heads &&
|
|
git for-each-ref --format="%(authordate:short)" refs/heads &&
|
|
git for-each-ref --format="%(authordate:local)" refs/heads &&
|
|
git for-each-ref --format="%(authordate:iso8601)" refs/heads &&
|
|
git for-each-ref --format="%(authordate:rfc2822)" refs/heads
|
|
'
|
|
|
|
test_expect_success 'Check invalid format specifiers are errors' '
|
|
test_must_fail git for-each-ref --format="%(authordate:INVALID)" refs/heads
|
|
'
|
|
|
|
test_expect_success 'arguments to %(objectname:short=) must be positive integers' '
|
|
test_must_fail git for-each-ref --format="%(objectname:short=0)" &&
|
|
test_must_fail git for-each-ref --format="%(objectname:short=-1)" &&
|
|
test_must_fail git for-each-ref --format="%(objectname:short=foo)"
|
|
'
|
|
|
|
test_date () {
|
|
f=$1 &&
|
|
committer_date=$2 &&
|
|
author_date=$3 &&
|
|
tagger_date=$4 &&
|
|
cat >expected <<-EOF &&
|
|
'refs/heads/main' '$committer_date' '$author_date'
|
|
'refs/tags/testtag' '$tagger_date'
|
|
EOF
|
|
(
|
|
git for-each-ref --shell \
|
|
--format="%(refname) %(committerdate${f:+:$f}) %(authordate${f:+:$f})" \
|
|
refs/heads &&
|
|
git for-each-ref --shell \
|
|
--format="%(refname) %(taggerdate${f:+:$f})" \
|
|
refs/tags
|
|
) >actual &&
|
|
test_cmp expected actual
|
|
}
|
|
|
|
test_expect_success 'Check unformatted date fields output' '
|
|
test_date "" \
|
|
"Tue Jul 4 01:18:43 2006 +0200" \
|
|
"Tue Jul 4 01:18:44 2006 +0200" \
|
|
"Tue Jul 4 01:18:45 2006 +0200"
|
|
'
|
|
|
|
test_expect_success 'Check format "default" formatted date fields output' '
|
|
test_date default \
|
|
"Tue Jul 4 01:18:43 2006 +0200" \
|
|
"Tue Jul 4 01:18:44 2006 +0200" \
|
|
"Tue Jul 4 01:18:45 2006 +0200"
|
|
'
|
|
|
|
test_expect_success 'Check format "default-local" date fields output' '
|
|
test_date default-local "Mon Jul 3 23:18:43 2006" "Mon Jul 3 23:18:44 2006" "Mon Jul 3 23:18:45 2006"
|
|
'
|
|
|
|
# Don't know how to do relative check because I can't know when this script
|
|
# is going to be run and can't fake the current time to git, and hence can't
|
|
# provide expected output. Instead, I'll just make sure that "relative"
|
|
# doesn't exit in error
|
|
test_expect_success 'Check format "relative" date fields output' '
|
|
f=relative &&
|
|
(git for-each-ref --shell --format="%(refname) %(committerdate:$f) %(authordate:$f)" refs/heads &&
|
|
git for-each-ref --shell --format="%(refname) %(taggerdate:$f)" refs/tags) >actual
|
|
'
|
|
|
|
# We just check that this is the same as "relative" for now.
|
|
test_expect_success 'Check format "relative-local" date fields output' '
|
|
test_date relative-local \
|
|
"$(git for-each-ref --format="%(committerdate:relative)" refs/heads)" \
|
|
"$(git for-each-ref --format="%(authordate:relative)" refs/heads)" \
|
|
"$(git for-each-ref --format="%(taggerdate:relative)" refs/tags)"
|
|
'
|
|
|
|
test_expect_success 'Check format "short" date fields output' '
|
|
test_date short 2006-07-04 2006-07-04 2006-07-04
|
|
'
|
|
|
|
test_expect_success 'Check format "short-local" date fields output' '
|
|
test_date short-local 2006-07-03 2006-07-03 2006-07-03
|
|
'
|
|
|
|
test_expect_success 'Check format "local" date fields output' '
|
|
test_date local \
|
|
"Mon Jul 3 23:18:43 2006" \
|
|
"Mon Jul 3 23:18:44 2006" \
|
|
"Mon Jul 3 23:18:45 2006"
|
|
'
|
|
|
|
test_expect_success 'Check format "iso8601" date fields output' '
|
|
test_date iso8601 \
|
|
"2006-07-04 01:18:43 +0200" \
|
|
"2006-07-04 01:18:44 +0200" \
|
|
"2006-07-04 01:18:45 +0200"
|
|
'
|
|
|
|
test_expect_success 'Check format "iso8601-local" date fields output' '
|
|
test_date iso8601-local "2006-07-03 23:18:43 +0000" "2006-07-03 23:18:44 +0000" "2006-07-03 23:18:45 +0000"
|
|
'
|
|
|
|
test_expect_success 'Check format "rfc2822" date fields output' '
|
|
test_date rfc2822 \
|
|
"Tue, 4 Jul 2006 01:18:43 +0200" \
|
|
"Tue, 4 Jul 2006 01:18:44 +0200" \
|
|
"Tue, 4 Jul 2006 01:18:45 +0200"
|
|
'
|
|
|
|
test_expect_success 'Check format "rfc2822-local" date fields output' '
|
|
test_date rfc2822-local "Mon, 3 Jul 2006 23:18:43 +0000" "Mon, 3 Jul 2006 23:18:44 +0000" "Mon, 3 Jul 2006 23:18:45 +0000"
|
|
'
|
|
|
|
test_expect_success 'Check format "raw" date fields output' '
|
|
test_date raw "1151968723 +0200" "1151968724 +0200" "1151968725 +0200"
|
|
'
|
|
|
|
test_expect_success 'Check format "raw-local" date fields output' '
|
|
test_date raw-local "1151968723 +0000" "1151968724 +0000" "1151968725 +0000"
|
|
'
|
|
|
|
test_expect_success 'Check format of strftime date fields' '
|
|
echo "my date is 2006-07-04" >expected &&
|
|
git for-each-ref \
|
|
--format="%(authordate:format:my date is %Y-%m-%d)" \
|
|
refs/heads >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Check format of strftime-local date fields' '
|
|
echo "my date is 2006-07-03" >expected &&
|
|
git for-each-ref \
|
|
--format="%(authordate:format-local:my date is %Y-%m-%d)" \
|
|
refs/heads >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'exercise strftime with odd fields' '
|
|
echo >expected &&
|
|
git for-each-ref --format="%(authordate:format:)" refs/heads >actual &&
|
|
test_cmp expected actual &&
|
|
long="long format -- $ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID$ZERO_OID" &&
|
|
echo $long >expected &&
|
|
git for-each-ref --format="%(authordate:format:$long)" refs/heads >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<\EOF
|
|
refs/heads/main
|
|
refs/remotes/origin/main
|
|
refs/tags/testtag
|
|
EOF
|
|
|
|
test_expect_success 'Verify ascending sort' '
|
|
git for-each-ref --format="%(refname)" --sort=refname >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
|
|
cat >expected <<\EOF
|
|
refs/tags/testtag
|
|
refs/remotes/origin/main
|
|
refs/heads/main
|
|
EOF
|
|
|
|
test_expect_success 'Verify descending sort' '
|
|
git for-each-ref --format="%(refname)" --sort=-refname >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Give help even with invalid sort atoms' '
|
|
test_expect_code 129 git for-each-ref --sort=bogus -h >actual 2>&1 &&
|
|
grep "^usage: git for-each-ref" actual
|
|
'
|
|
|
|
cat >expected <<\EOF
|
|
refs/tags/testtag
|
|
refs/tags/testtag-2
|
|
EOF
|
|
|
|
test_expect_success 'exercise patterns with prefixes' '
|
|
git tag testtag-2 &&
|
|
test_when_finished "git tag -d testtag-2" &&
|
|
git for-each-ref --format="%(refname)" \
|
|
refs/tags/testtag refs/tags/testtag-2 >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<\EOF
|
|
refs/tags/testtag
|
|
refs/tags/testtag-2
|
|
EOF
|
|
|
|
test_expect_success 'exercise glob patterns with prefixes' '
|
|
git tag testtag-2 &&
|
|
test_when_finished "git tag -d testtag-2" &&
|
|
git for-each-ref --format="%(refname)" \
|
|
refs/tags/testtag "refs/tags/testtag-*" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<\EOF
|
|
'refs/heads/main'
|
|
'refs/remotes/origin/main'
|
|
'refs/tags/testtag'
|
|
EOF
|
|
|
|
test_expect_success 'Quoting style: shell' '
|
|
git for-each-ref --shell --format="%(refname)" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Quoting style: perl' '
|
|
git for-each-ref --perl --format="%(refname)" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Quoting style: python' '
|
|
git for-each-ref --python --format="%(refname)" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<\EOF
|
|
"refs/heads/main"
|
|
"refs/remotes/origin/main"
|
|
"refs/tags/testtag"
|
|
EOF
|
|
|
|
test_expect_success 'Quoting style: tcl' '
|
|
git for-each-ref --tcl --format="%(refname)" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
for i in "--perl --shell" "-s --python" "--python --tcl" "--tcl --perl"; do
|
|
test_expect_success "more than one quoting style: $i" "
|
|
test_must_fail git for-each-ref $i 2>err &&
|
|
grep '^error: more than one quoting style' err
|
|
"
|
|
done
|
|
|
|
test_expect_success 'setup for upstream:track[short]' '
|
|
test_commit two
|
|
'
|
|
|
|
test_atom head upstream:track '[ahead 1]'
|
|
test_atom head upstream:trackshort '>'
|
|
test_atom head upstream:track,nobracket 'ahead 1'
|
|
test_atom head upstream:nobracket,track 'ahead 1'
|
|
|
|
test_expect_success 'setup for push:track[short]' '
|
|
test_commit third &&
|
|
git update-ref refs/remotes/myfork/main main &&
|
|
git reset main~1
|
|
'
|
|
|
|
test_atom head push:track '[behind 1]'
|
|
test_atom head push:trackshort '<'
|
|
|
|
test_expect_success 'Check that :track[short] cannot be used with other atoms' '
|
|
test_must_fail git for-each-ref --format="%(refname:track)" 2>/dev/null &&
|
|
test_must_fail git for-each-ref --format="%(refname:trackshort)" 2>/dev/null
|
|
'
|
|
|
|
test_expect_success 'Check that :track[short] works when upstream is invalid' '
|
|
cat >expected <<-\EOF &&
|
|
[gone]
|
|
|
|
EOF
|
|
test_when_finished "git config branch.main.merge refs/heads/main" &&
|
|
git config branch.main.merge refs/heads/does-not-exist &&
|
|
git for-each-ref \
|
|
--format="%(upstream:track)$LF%(upstream:trackshort)" \
|
|
refs/heads >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Check for invalid refname format' '
|
|
test_must_fail git for-each-ref --format="%(refname:INVALID)"
|
|
'
|
|
|
|
test_expect_success 'set up color tests' '
|
|
cat >expected.color <<-EOF &&
|
|
$(git rev-parse --short refs/heads/main) <GREEN>main<RESET>
|
|
$(git rev-parse --short refs/remotes/myfork/main) <GREEN>myfork/main<RESET>
|
|
$(git rev-parse --short refs/remotes/origin/main) <GREEN>origin/main<RESET>
|
|
$(git rev-parse --short refs/tags/testtag) <GREEN>testtag<RESET>
|
|
$(git rev-parse --short refs/tags/third) <GREEN>third<RESET>
|
|
$(git rev-parse --short refs/tags/two) <GREEN>two<RESET>
|
|
EOF
|
|
sed "s/<[^>]*>//g" <expected.color >expected.bare &&
|
|
color_format="%(objectname:short) %(color:green)%(refname:short)"
|
|
'
|
|
|
|
test_expect_success TTY '%(color) shows color with a tty' '
|
|
test_terminal git for-each-ref --format="$color_format" >actual.raw &&
|
|
test_decode_color <actual.raw >actual &&
|
|
test_cmp expected.color actual
|
|
'
|
|
|
|
test_expect_success '%(color) does not show color without tty' '
|
|
TERM=vt100 git for-each-ref --format="$color_format" >actual &&
|
|
test_cmp expected.bare actual
|
|
'
|
|
|
|
test_expect_success '--color can override tty check' '
|
|
git for-each-ref --color --format="$color_format" >actual.raw &&
|
|
test_decode_color <actual.raw >actual &&
|
|
test_cmp expected.color actual
|
|
'
|
|
|
|
test_expect_success 'color.ui=always does not override tty check' '
|
|
git -c color.ui=always for-each-ref --format="$color_format" >actual &&
|
|
test_cmp expected.bare actual
|
|
'
|
|
|
|
cat >expected <<\EOF
|
|
heads/main
|
|
tags/main
|
|
EOF
|
|
|
|
test_expect_success 'Check ambiguous head and tag refs (strict)' '
|
|
git config --bool core.warnambiguousrefs true &&
|
|
git checkout -b newtag &&
|
|
echo "Using $datestamp" > one &&
|
|
git add one &&
|
|
git commit -m "Branch" &&
|
|
setdate_and_increment &&
|
|
git tag -m "Tagging at $datestamp" main &&
|
|
git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<\EOF
|
|
heads/main
|
|
main
|
|
EOF
|
|
|
|
test_expect_success 'Check ambiguous head and tag refs (loose)' '
|
|
git config --bool core.warnambiguousrefs false &&
|
|
git for-each-ref --format "%(refname:short)" refs/heads/main refs/tags/main >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<\EOF
|
|
heads/ambiguous
|
|
ambiguous
|
|
EOF
|
|
|
|
test_expect_success 'Check ambiguous head and tag refs II (loose)' '
|
|
git checkout main &&
|
|
git tag ambiguous testtag^0 &&
|
|
git branch ambiguous testtag^0 &&
|
|
git for-each-ref --format "%(refname:short)" refs/heads/ambiguous refs/tags/ambiguous >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'create tag without tagger' '
|
|
git tag -a -m "Broken tag" taggerless &&
|
|
git tag -f taggerless $(git cat-file tag taggerless |
|
|
sed -e "/^tagger /d" |
|
|
git hash-object --stdin -w -t tag)
|
|
'
|
|
|
|
test_atom refs/tags/taggerless type 'commit'
|
|
test_atom refs/tags/taggerless tag 'taggerless'
|
|
test_atom refs/tags/taggerless tagger ''
|
|
test_atom refs/tags/taggerless taggername ''
|
|
test_atom refs/tags/taggerless taggeremail ''
|
|
test_atom refs/tags/taggerless taggeremail:trim ''
|
|
test_atom refs/tags/taggerless taggeremail:localpart ''
|
|
test_atom refs/tags/taggerless taggerdate ''
|
|
test_atom refs/tags/taggerless committer ''
|
|
test_atom refs/tags/taggerless committername ''
|
|
test_atom refs/tags/taggerless committeremail ''
|
|
test_atom refs/tags/taggerless committeremail:trim ''
|
|
test_atom refs/tags/taggerless committeremail:localpart ''
|
|
test_atom refs/tags/taggerless committerdate ''
|
|
test_atom refs/tags/taggerless subject 'Broken tag'
|
|
|
|
test_expect_success 'an unusual tag with an incomplete line' '
|
|
|
|
git tag -m "bogo" bogo &&
|
|
bogo=$(git cat-file tag bogo) &&
|
|
bogo=$(printf "%s" "$bogo" | git mktag) &&
|
|
git tag -f bogo "$bogo" &&
|
|
git for-each-ref --format "%(body)" refs/tags/bogo
|
|
|
|
'
|
|
|
|
test_expect_success 'create tag with subject and body content' '
|
|
cat >>msg <<-\EOF &&
|
|
the subject line
|
|
|
|
first body line
|
|
second body line
|
|
EOF
|
|
git tag -F msg subject-body
|
|
'
|
|
test_atom refs/tags/subject-body subject 'the subject line'
|
|
test_atom refs/tags/subject-body subject:sanitize 'the-subject-line'
|
|
test_atom refs/tags/subject-body body 'first body line
|
|
second body line
|
|
'
|
|
test_atom refs/tags/subject-body contents 'the subject line
|
|
|
|
first body line
|
|
second body line
|
|
'
|
|
|
|
test_expect_success 'create tag with multiline subject' '
|
|
cat >msg <<-\EOF &&
|
|
first subject line
|
|
second subject line
|
|
|
|
first body line
|
|
second body line
|
|
EOF
|
|
git tag -F msg multiline
|
|
'
|
|
test_atom refs/tags/multiline subject 'first subject line second subject line'
|
|
test_atom refs/tags/multiline subject:sanitize 'first-subject-line-second-subject-line'
|
|
test_atom refs/tags/multiline contents:subject 'first subject line second subject line'
|
|
test_atom refs/tags/multiline body 'first body line
|
|
second body line
|
|
'
|
|
test_atom refs/tags/multiline contents:body 'first body line
|
|
second body line
|
|
'
|
|
test_atom refs/tags/multiline contents:signature ''
|
|
test_atom refs/tags/multiline contents 'first subject line
|
|
second subject line
|
|
|
|
first body line
|
|
second body line
|
|
'
|
|
|
|
test_expect_success GPG 'create signed tags' '
|
|
git tag -s -m "" signed-empty &&
|
|
git tag -s -m "subject line" signed-short &&
|
|
cat >msg <<-\EOF &&
|
|
subject line
|
|
|
|
body contents
|
|
EOF
|
|
git tag -s -F msg signed-long
|
|
'
|
|
|
|
sig='-----BEGIN PGP SIGNATURE-----
|
|
-----END PGP SIGNATURE-----
|
|
'
|
|
|
|
PREREQ=GPG
|
|
test_atom refs/tags/signed-empty subject ''
|
|
test_atom refs/tags/signed-empty subject:sanitize ''
|
|
test_atom refs/tags/signed-empty contents:subject ''
|
|
test_atom refs/tags/signed-empty body "$sig"
|
|
test_atom refs/tags/signed-empty contents:body ''
|
|
test_atom refs/tags/signed-empty contents:signature "$sig"
|
|
test_atom refs/tags/signed-empty contents "$sig"
|
|
|
|
test_expect_success GPG 'basic atom: refs/tags/signed-empty raw' '
|
|
git cat-file tag refs/tags/signed-empty >expected &&
|
|
git for-each-ref --format="%(raw)" refs/tags/signed-empty >actual &&
|
|
sanitize_pgp <expected >expected.clean &&
|
|
echo >>expected.clean &&
|
|
sanitize_pgp <actual >actual.clean &&
|
|
test_cmp expected.clean actual.clean
|
|
'
|
|
|
|
test_atom refs/tags/signed-short subject 'subject line'
|
|
test_atom refs/tags/signed-short subject:sanitize 'subject-line'
|
|
test_atom refs/tags/signed-short contents:subject 'subject line'
|
|
test_atom refs/tags/signed-short body "$sig"
|
|
test_atom refs/tags/signed-short contents:body ''
|
|
test_atom refs/tags/signed-short contents:signature "$sig"
|
|
test_atom refs/tags/signed-short contents "subject line
|
|
$sig"
|
|
|
|
test_expect_success GPG 'basic atom: refs/tags/signed-short raw' '
|
|
git cat-file tag refs/tags/signed-short >expected &&
|
|
git for-each-ref --format="%(raw)" refs/tags/signed-short >actual &&
|
|
sanitize_pgp <expected >expected.clean &&
|
|
echo >>expected.clean &&
|
|
sanitize_pgp <actual >actual.clean &&
|
|
test_cmp expected.clean actual.clean
|
|
'
|
|
|
|
test_atom refs/tags/signed-long subject 'subject line'
|
|
test_atom refs/tags/signed-long subject:sanitize 'subject-line'
|
|
test_atom refs/tags/signed-long contents:subject 'subject line'
|
|
test_atom refs/tags/signed-long body "body contents
|
|
$sig"
|
|
test_atom refs/tags/signed-long contents:body 'body contents
|
|
'
|
|
test_atom refs/tags/signed-long contents:signature "$sig"
|
|
test_atom refs/tags/signed-long contents "subject line
|
|
|
|
body contents
|
|
$sig"
|
|
|
|
test_expect_success GPG 'basic atom: refs/tags/signed-long raw' '
|
|
git cat-file tag refs/tags/signed-long >expected &&
|
|
git for-each-ref --format="%(raw)" refs/tags/signed-long >actual &&
|
|
sanitize_pgp <expected >expected.clean &&
|
|
echo >>expected.clean &&
|
|
sanitize_pgp <actual >actual.clean &&
|
|
test_cmp expected.clean actual.clean
|
|
'
|
|
|
|
test_expect_success 'set up refs pointing to tree and blob' '
|
|
git update-ref refs/mytrees/first refs/heads/main^{tree} &&
|
|
git update-ref refs/myblobs/first refs/heads/main:one
|
|
'
|
|
|
|
test_atom refs/mytrees/first subject ""
|
|
test_atom refs/mytrees/first contents:subject ""
|
|
test_atom refs/mytrees/first body ""
|
|
test_atom refs/mytrees/first contents:body ""
|
|
test_atom refs/mytrees/first contents:signature ""
|
|
test_atom refs/mytrees/first contents ""
|
|
|
|
test_expect_success 'basic atom: refs/mytrees/first raw' '
|
|
git cat-file tree refs/mytrees/first >expected &&
|
|
echo >>expected &&
|
|
git for-each-ref --format="%(raw)" refs/mytrees/first >actual &&
|
|
test_cmp expected actual &&
|
|
git cat-file -s refs/mytrees/first >expected &&
|
|
git for-each-ref --format="%(raw:size)" refs/mytrees/first >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_atom refs/myblobs/first subject ""
|
|
test_atom refs/myblobs/first contents:subject ""
|
|
test_atom refs/myblobs/first body ""
|
|
test_atom refs/myblobs/first contents:body ""
|
|
test_atom refs/myblobs/first contents:signature ""
|
|
test_atom refs/myblobs/first contents ""
|
|
|
|
test_expect_success 'basic atom: refs/myblobs/first raw' '
|
|
git cat-file blob refs/myblobs/first >expected &&
|
|
echo >>expected &&
|
|
git for-each-ref --format="%(raw)" refs/myblobs/first >actual &&
|
|
test_cmp expected actual &&
|
|
git cat-file -s refs/myblobs/first >expected &&
|
|
git for-each-ref --format="%(raw:size)" refs/myblobs/first >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'set up refs pointing to binary blob' '
|
|
printf "a\0b\0c" >blob1 &&
|
|
printf "a\0c\0b" >blob2 &&
|
|
printf "\0a\0b\0c" >blob3 &&
|
|
printf "abc" >blob4 &&
|
|
printf "\0 \0 \0 " >blob5 &&
|
|
printf "\0 \0a\0 " >blob6 &&
|
|
printf " " >blob7 &&
|
|
>blob8 &&
|
|
obj=$(git hash-object -w blob1) &&
|
|
git update-ref refs/myblobs/blob1 "$obj" &&
|
|
obj=$(git hash-object -w blob2) &&
|
|
git update-ref refs/myblobs/blob2 "$obj" &&
|
|
obj=$(git hash-object -w blob3) &&
|
|
git update-ref refs/myblobs/blob3 "$obj" &&
|
|
obj=$(git hash-object -w blob4) &&
|
|
git update-ref refs/myblobs/blob4 "$obj" &&
|
|
obj=$(git hash-object -w blob5) &&
|
|
git update-ref refs/myblobs/blob5 "$obj" &&
|
|
obj=$(git hash-object -w blob6) &&
|
|
git update-ref refs/myblobs/blob6 "$obj" &&
|
|
obj=$(git hash-object -w blob7) &&
|
|
git update-ref refs/myblobs/blob7 "$obj" &&
|
|
obj=$(git hash-object -w blob8) &&
|
|
git update-ref refs/myblobs/blob8 "$obj"
|
|
'
|
|
|
|
test_expect_success 'Verify sorts with raw' '
|
|
cat >expected <<-EOF &&
|
|
refs/myblobs/blob8
|
|
refs/myblobs/blob5
|
|
refs/myblobs/blob6
|
|
refs/myblobs/blob3
|
|
refs/myblobs/blob7
|
|
refs/mytrees/first
|
|
refs/myblobs/first
|
|
refs/myblobs/blob1
|
|
refs/myblobs/blob2
|
|
refs/myblobs/blob4
|
|
refs/heads/main
|
|
EOF
|
|
git for-each-ref --format="%(refname)" --sort=raw \
|
|
refs/heads/main refs/myblobs/ refs/mytrees/first >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'Verify sorts with raw:size' '
|
|
cat >expected <<-EOF &&
|
|
refs/myblobs/blob8
|
|
refs/myblobs/first
|
|
refs/myblobs/blob7
|
|
refs/heads/main
|
|
refs/myblobs/blob4
|
|
refs/myblobs/blob1
|
|
refs/myblobs/blob2
|
|
refs/myblobs/blob3
|
|
refs/myblobs/blob5
|
|
refs/myblobs/blob6
|
|
refs/mytrees/first
|
|
EOF
|
|
git for-each-ref --format="%(refname)" --sort=raw:size \
|
|
refs/heads/main refs/myblobs/ refs/mytrees/first >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'validate raw atom with %(if:equals)' '
|
|
cat >expected <<-EOF &&
|
|
not equals
|
|
not equals
|
|
not equals
|
|
not equals
|
|
not equals
|
|
not equals
|
|
refs/myblobs/blob4
|
|
not equals
|
|
not equals
|
|
not equals
|
|
not equals
|
|
not equals
|
|
EOF
|
|
git for-each-ref --format="%(if:equals=abc)%(raw)%(then)%(refname)%(else)not equals%(end)" \
|
|
refs/myblobs/ refs/heads/ >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'validate raw atom with %(if:notequals)' '
|
|
cat >expected <<-EOF &&
|
|
refs/heads/ambiguous
|
|
refs/heads/main
|
|
refs/heads/newtag
|
|
refs/myblobs/blob1
|
|
refs/myblobs/blob2
|
|
refs/myblobs/blob3
|
|
equals
|
|
refs/myblobs/blob5
|
|
refs/myblobs/blob6
|
|
refs/myblobs/blob7
|
|
refs/myblobs/blob8
|
|
refs/myblobs/first
|
|
EOF
|
|
git for-each-ref --format="%(if:notequals=abc)%(raw)%(then)%(refname)%(else)equals%(end)" \
|
|
refs/myblobs/ refs/heads/ >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'empty raw refs with %(if)' '
|
|
cat >expected <<-EOF &&
|
|
refs/myblobs/blob1 not empty
|
|
refs/myblobs/blob2 not empty
|
|
refs/myblobs/blob3 not empty
|
|
refs/myblobs/blob4 not empty
|
|
refs/myblobs/blob5 not empty
|
|
refs/myblobs/blob6 not empty
|
|
refs/myblobs/blob7 empty
|
|
refs/myblobs/blob8 empty
|
|
refs/myblobs/first not empty
|
|
EOF
|
|
git for-each-ref --format="%(refname) %(if)%(raw)%(then)not empty%(else)empty%(end)" \
|
|
refs/myblobs/ >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success '%(raw) with --python must fail' '
|
|
test_must_fail git for-each-ref --format="%(raw)" --python
|
|
'
|
|
|
|
test_expect_success '%(raw) with --tcl must fail' '
|
|
test_must_fail git for-each-ref --format="%(raw)" --tcl
|
|
'
|
|
|
|
test_expect_success '%(raw) with --perl' '
|
|
git for-each-ref --format="\$name= %(raw);
|
|
print \"\$name\"" refs/myblobs/blob1 --perl | perl >actual &&
|
|
cmp blob1 actual &&
|
|
git for-each-ref --format="\$name= %(raw);
|
|
print \"\$name\"" refs/myblobs/blob3 --perl | perl >actual &&
|
|
cmp blob3 actual &&
|
|
git for-each-ref --format="\$name= %(raw);
|
|
print \"\$name\"" refs/myblobs/blob8 --perl | perl >actual &&
|
|
cmp blob8 actual &&
|
|
git for-each-ref --format="\$name= %(raw);
|
|
print \"\$name\"" refs/myblobs/first --perl | perl >actual &&
|
|
cmp one actual &&
|
|
git cat-file tree refs/mytrees/first > expected &&
|
|
git for-each-ref --format="\$name= %(raw);
|
|
print \"\$name\"" refs/mytrees/first --perl | perl >actual &&
|
|
cmp expected actual
|
|
'
|
|
|
|
test_expect_success '%(raw) with --shell must fail' '
|
|
test_must_fail git for-each-ref --format="%(raw)" --shell
|
|
'
|
|
|
|
test_expect_success '%(raw) with --shell and --sort=raw must fail' '
|
|
test_must_fail git for-each-ref --format="%(raw)" --sort=raw --shell
|
|
'
|
|
|
|
test_expect_success '%(raw:size) with --shell' '
|
|
git for-each-ref --format="%(raw:size)" | sed "s/^/$SQ/;s/$/$SQ/" >expect &&
|
|
git for-each-ref --format="%(raw:size)" --shell >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'for-each-ref --format compare with cat-file --batch' '
|
|
git rev-parse refs/mytrees/first | git cat-file --batch >expected &&
|
|
git for-each-ref --format="%(objectname) %(objecttype) %(objectsize)
|
|
%(raw)" refs/mytrees/first >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'set up multiple-sort tags' '
|
|
for when in 100000 200000
|
|
do
|
|
for email in user1 user2
|
|
do
|
|
for ref in ref1 ref2
|
|
do
|
|
GIT_COMMITTER_DATE="@$when +0000" \
|
|
GIT_COMMITTER_EMAIL="$email@example.com" \
|
|
git tag -m "tag $ref-$when-$email" \
|
|
multi-$ref-$when-$email || return 1
|
|
done
|
|
done
|
|
done
|
|
'
|
|
|
|
test_expect_success 'Verify sort with multiple keys' '
|
|
cat >expected <<-\EOF &&
|
|
100000 <user1@example.com> refs/tags/multi-ref2-100000-user1
|
|
100000 <user1@example.com> refs/tags/multi-ref1-100000-user1
|
|
100000 <user2@example.com> refs/tags/multi-ref2-100000-user2
|
|
100000 <user2@example.com> refs/tags/multi-ref1-100000-user2
|
|
200000 <user1@example.com> refs/tags/multi-ref2-200000-user1
|
|
200000 <user1@example.com> refs/tags/multi-ref1-200000-user1
|
|
200000 <user2@example.com> refs/tags/multi-ref2-200000-user2
|
|
200000 <user2@example.com> refs/tags/multi-ref1-200000-user2
|
|
EOF
|
|
git for-each-ref \
|
|
--format="%(taggerdate:unix) %(taggeremail) %(refname)" \
|
|
--sort=-refname \
|
|
--sort=taggeremail \
|
|
--sort=taggerdate \
|
|
"refs/tags/multi-*" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'equivalent sorts fall back on refname' '
|
|
cat >expected <<-\EOF &&
|
|
100000 <user1@example.com> refs/tags/multi-ref1-100000-user1
|
|
100000 <user2@example.com> refs/tags/multi-ref1-100000-user2
|
|
100000 <user1@example.com> refs/tags/multi-ref2-100000-user1
|
|
100000 <user2@example.com> refs/tags/multi-ref2-100000-user2
|
|
200000 <user1@example.com> refs/tags/multi-ref1-200000-user1
|
|
200000 <user2@example.com> refs/tags/multi-ref1-200000-user2
|
|
200000 <user1@example.com> refs/tags/multi-ref2-200000-user1
|
|
200000 <user2@example.com> refs/tags/multi-ref2-200000-user2
|
|
EOF
|
|
git for-each-ref \
|
|
--format="%(taggerdate:unix) %(taggeremail) %(refname)" \
|
|
--sort=taggerdate \
|
|
"refs/tags/multi-*" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success '--no-sort cancels the previous sort keys' '
|
|
cat >expected <<-\EOF &&
|
|
100000 <user1@example.com> refs/tags/multi-ref1-100000-user1
|
|
100000 <user2@example.com> refs/tags/multi-ref1-100000-user2
|
|
100000 <user1@example.com> refs/tags/multi-ref2-100000-user1
|
|
100000 <user2@example.com> refs/tags/multi-ref2-100000-user2
|
|
200000 <user1@example.com> refs/tags/multi-ref1-200000-user1
|
|
200000 <user2@example.com> refs/tags/multi-ref1-200000-user2
|
|
200000 <user1@example.com> refs/tags/multi-ref2-200000-user1
|
|
200000 <user2@example.com> refs/tags/multi-ref2-200000-user2
|
|
EOF
|
|
git for-each-ref \
|
|
--format="%(taggerdate:unix) %(taggeremail) %(refname)" \
|
|
--sort=-refname \
|
|
--sort=taggeremail \
|
|
--no-sort \
|
|
--sort=taggerdate \
|
|
"refs/tags/multi-*" >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'do not dereference NULL upon %(HEAD) on unborn branch' '
|
|
test_when_finished "git checkout main" &&
|
|
git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
|
|
sed -e "s/^\* / /" actual >expect &&
|
|
git checkout --orphan orphaned-branch &&
|
|
git for-each-ref --format="%(HEAD) %(refname:short)" refs/heads/ >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >trailers <<EOF
|
|
Reviewed-by: A U Thor <author@example.com>
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
[ v2 updated patch description ]
|
|
Acked-by: A U Thor
|
|
<author@example.com>
|
|
EOF
|
|
|
|
unfold () {
|
|
perl -0pe 's/\n\s+/ /g'
|
|
}
|
|
|
|
test_expect_success 'set up trailers for next test' '
|
|
echo "Some contents" > two &&
|
|
git add two &&
|
|
git commit -F - <<-EOF
|
|
trailers: this commit message has trailers
|
|
|
|
Some message contents
|
|
|
|
$(cat trailers)
|
|
EOF
|
|
'
|
|
|
|
test_trailer_option () {
|
|
title=$1 option=$2
|
|
cat >expect
|
|
test_expect_success "$title" '
|
|
git for-each-ref --format="%($option)" refs/heads/main >actual &&
|
|
test_cmp expect actual &&
|
|
git for-each-ref --format="%(contents:$option)" refs/heads/main >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
}
|
|
|
|
test_trailer_option '%(trailers:unfold) unfolds trailers' \
|
|
'trailers:unfold' <<-EOF
|
|
$(unfold <trailers)
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:only) shows only "key: value" trailers' \
|
|
'trailers:only' <<-EOF
|
|
$(grep -v patch.description <trailers)
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:only=no,only=true) shows only "key: value" trailers' \
|
|
'trailers:only=no,only=true' <<-EOF
|
|
$(grep -v patch.description <trailers)
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:only=yes) shows only "key: value" trailers' \
|
|
'trailers:only=yes' <<-EOF
|
|
$(grep -v patch.description <trailers)
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:only=no) shows all trailers' \
|
|
'trailers:only=no' <<-EOF
|
|
$(cat trailers)
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:only) and %(trailers:unfold) work together' \
|
|
'trailers:only,unfold' <<-EOF
|
|
$(grep -v patch.description <trailers | unfold)
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:unfold) and %(trailers:only) work together' \
|
|
'trailers:unfold,only' <<-EOF
|
|
$(grep -v patch.description <trailers | unfold)
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:key=foo) shows that trailer' \
|
|
'trailers:key=Signed-off-by' <<-EOF
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:key=foo) is case insensitive' \
|
|
'trailers:key=SiGned-oFf-bY' <<-EOF
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:key=foo:) trailing colon also works' \
|
|
'trailers:key=Signed-off-by:' <<-EOF
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:key=foo) multiple keys' \
|
|
'trailers:key=Reviewed-by:,key=Signed-off-by' <<-EOF
|
|
Reviewed-by: A U Thor <author@example.com>
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:key=nonexistent) becomes empty' \
|
|
'trailers:key=Shined-off-by:' <<-EOF
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:key=foo) handles multiple lines even if folded' \
|
|
'trailers:key=Acked-by' <<-EOF
|
|
$(grep -v patch.description <trailers | grep -v Signed-off-by | grep -v Reviewed-by)
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:key=foo,unfold) properly unfolds' \
|
|
'trailers:key=Signed-Off-by,unfold' <<-EOF
|
|
$(unfold <trailers | grep Signed-off-by)
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:key=foo,only=no) also includes nontrailer lines' \
|
|
'trailers:key=Signed-off-by,only=no' <<-EOF
|
|
Signed-off-by: A U Thor <author@example.com>
|
|
$(grep patch.description <trailers)
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:key=foo,valueonly) shows only value' \
|
|
'trailers:key=Signed-off-by,valueonly' <<-EOF
|
|
A U Thor <author@example.com>
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:separator) changes separator' \
|
|
'trailers:separator=%x2C,key=Reviewed-by,key=Signed-off-by:' <<-EOF
|
|
Reviewed-by: A U Thor <author@example.com>,Signed-off-by: A U Thor <author@example.com>
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:key_value_separator) changes key-value separator' \
|
|
'trailers:key_value_separator=%x2C,key=Reviewed-by,key=Signed-off-by:' <<-EOF
|
|
Reviewed-by,A U Thor <author@example.com>
|
|
Signed-off-by,A U Thor <author@example.com>
|
|
|
|
EOF
|
|
|
|
test_trailer_option '%(trailers:separator,key_value_separator) changes both separators' \
|
|
'trailers:separator=%x2C,key_value_separator=%x2C,key=Reviewed-by,key=Signed-off-by:' <<-EOF
|
|
Reviewed-by,A U Thor <author@example.com>,Signed-off-by,A U Thor <author@example.com>
|
|
EOF
|
|
|
|
test_failing_trailer_option () {
|
|
title=$1 option=$2
|
|
cat >expect
|
|
test_expect_success "$title" '
|
|
# error message cannot be checked under i18n
|
|
test_must_fail git for-each-ref --format="%($option)" refs/heads/main 2>actual &&
|
|
test_cmp expect actual &&
|
|
test_must_fail git for-each-ref --format="%(contents:$option)" refs/heads/main 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
}
|
|
|
|
test_failing_trailer_option '%(trailers) rejects unknown trailers arguments' \
|
|
'trailers:unsupported' <<-\EOF
|
|
fatal: unknown %(trailers) argument: unsupported
|
|
EOF
|
|
|
|
test_failing_trailer_option '%(trailers:key) without value is error' \
|
|
'trailers:key' <<-\EOF
|
|
fatal: expected %(trailers:key=<value>)
|
|
EOF
|
|
|
|
test_expect_success 'if arguments, %(contents:trailers) shows error if colon is missing' '
|
|
cat >expect <<-EOF &&
|
|
fatal: unrecognized %(contents) argument: trailersonly
|
|
EOF
|
|
test_must_fail git for-each-ref --format="%(contents:trailersonly)" 2>actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'basic atom: head contents:trailers' '
|
|
git for-each-ref --format="%(contents:trailers)" refs/heads/main >actual &&
|
|
sanitize_pgp <actual >actual.clean &&
|
|
# git for-each-ref ends with a blank line
|
|
cat >expect <<-EOF &&
|
|
$(cat trailers)
|
|
|
|
EOF
|
|
test_cmp expect actual.clean
|
|
'
|
|
|
|
test_expect_success 'basic atom: rest must fail' '
|
|
test_must_fail git for-each-ref --format="%(rest)" refs/heads/main
|
|
'
|
|
|
|
test_expect_success 'trailer parsing not fooled by --- line' '
|
|
git commit --allow-empty -F - <<-\EOF &&
|
|
this is the subject
|
|
|
|
This is the body. The message has a "---" line which would confuse a
|
|
message+patch parser. But here we know we have only a commit message,
|
|
so we get it right.
|
|
|
|
trailer: wrong
|
|
---
|
|
This is more body.
|
|
|
|
trailer: right
|
|
EOF
|
|
|
|
{
|
|
echo "trailer: right" &&
|
|
echo
|
|
} >expect &&
|
|
git for-each-ref --format="%(trailers)" refs/heads/main >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'Add symbolic ref for the following tests' '
|
|
git symbolic-ref refs/heads/sym refs/heads/main
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
refs/heads/main
|
|
EOF
|
|
|
|
test_expect_success 'Verify usage of %(symref) atom' '
|
|
git for-each-ref --format="%(symref)" refs/heads/sym >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
heads/main
|
|
EOF
|
|
|
|
test_expect_success 'Verify usage of %(symref:short) atom' '
|
|
git for-each-ref --format="%(symref:short)" refs/heads/sym >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
main
|
|
heads/main
|
|
EOF
|
|
|
|
test_expect_success 'Verify usage of %(symref:lstrip) atom' '
|
|
git for-each-ref --format="%(symref:lstrip=2)" refs/heads/sym > actual &&
|
|
git for-each-ref --format="%(symref:lstrip=-2)" refs/heads/sym >> actual &&
|
|
test_cmp expected actual &&
|
|
|
|
git for-each-ref --format="%(symref:strip=2)" refs/heads/sym > actual &&
|
|
git for-each-ref --format="%(symref:strip=-2)" refs/heads/sym >> actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
refs
|
|
refs/heads
|
|
EOF
|
|
|
|
test_expect_success 'Verify usage of %(symref:rstrip) atom' '
|
|
git for-each-ref --format="%(symref:rstrip=2)" refs/heads/sym > actual &&
|
|
git for-each-ref --format="%(symref:rstrip=-2)" refs/heads/sym >> actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success ':remotename and :remoteref' '
|
|
git init remote-tests &&
|
|
(
|
|
cd remote-tests &&
|
|
test_commit initial &&
|
|
git branch -M main &&
|
|
git remote add from fifth.coffee:blub &&
|
|
git config branch.main.remote from &&
|
|
git config branch.main.merge refs/heads/stable &&
|
|
git remote add to southridge.audio:repo &&
|
|
git config remote.to.push "refs/heads/*:refs/heads/pushed/*" &&
|
|
git config branch.main.pushRemote to &&
|
|
for pair in "%(upstream)=refs/remotes/from/stable" \
|
|
"%(upstream:remotename)=from" \
|
|
"%(upstream:remoteref)=refs/heads/stable" \
|
|
"%(push)=refs/remotes/to/pushed/main" \
|
|
"%(push:remotename)=to" \
|
|
"%(push:remoteref)=refs/heads/pushed/main"
|
|
do
|
|
echo "${pair#*=}" >expect &&
|
|
git for-each-ref --format="${pair%=*}" \
|
|
refs/heads/main >actual &&
|
|
test_cmp expect actual || exit 1
|
|
done &&
|
|
git branch push-simple &&
|
|
git config branch.push-simple.pushRemote from &&
|
|
actual="$(git for-each-ref \
|
|
--format="%(push:remotename),%(push:remoteref)" \
|
|
refs/heads/push-simple)" &&
|
|
test from, = "$actual"
|
|
)
|
|
'
|
|
|
|
test_expect_success 'for-each-ref --ignore-case ignores case' '
|
|
git for-each-ref --format="%(refname)" refs/heads/MAIN >actual &&
|
|
test_must_be_empty actual &&
|
|
|
|
echo refs/heads/main >expect &&
|
|
git for-each-ref --format="%(refname)" --ignore-case \
|
|
refs/heads/MAIN >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'for-each-ref --ignore-case works on multiple sort keys' '
|
|
# name refs numerically to avoid case-insensitive filesystem conflicts
|
|
nr=0 &&
|
|
for email in a A b B
|
|
do
|
|
for subject in a A b B
|
|
do
|
|
GIT_COMMITTER_EMAIL="$email@example.com" \
|
|
git tag -m "tag $subject" icase-$(printf %02d $nr) &&
|
|
nr=$((nr+1))||
|
|
return 1
|
|
done
|
|
done &&
|
|
git for-each-ref --ignore-case \
|
|
--format="%(taggeremail) %(subject) %(refname)" \
|
|
--sort=refname \
|
|
--sort=subject \
|
|
--sort=taggeremail \
|
|
refs/tags/icase-* >actual &&
|
|
cat >expect <<-\EOF &&
|
|
<a@example.com> tag a refs/tags/icase-00
|
|
<a@example.com> tag A refs/tags/icase-01
|
|
<A@example.com> tag a refs/tags/icase-04
|
|
<A@example.com> tag A refs/tags/icase-05
|
|
<a@example.com> tag b refs/tags/icase-02
|
|
<a@example.com> tag B refs/tags/icase-03
|
|
<A@example.com> tag b refs/tags/icase-06
|
|
<A@example.com> tag B refs/tags/icase-07
|
|
<b@example.com> tag a refs/tags/icase-08
|
|
<b@example.com> tag A refs/tags/icase-09
|
|
<B@example.com> tag a refs/tags/icase-12
|
|
<B@example.com> tag A refs/tags/icase-13
|
|
<b@example.com> tag b refs/tags/icase-10
|
|
<b@example.com> tag B refs/tags/icase-11
|
|
<B@example.com> tag b refs/tags/icase-14
|
|
<B@example.com> tag B refs/tags/icase-15
|
|
EOF
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'for-each-ref reports broken tags' '
|
|
git tag -m "good tag" broken-tag-good HEAD &&
|
|
git cat-file tag broken-tag-good >good &&
|
|
sed s/commit/blob/ <good >bad &&
|
|
bad=$(git hash-object -w -t tag bad) &&
|
|
git update-ref refs/tags/broken-tag-bad $bad &&
|
|
test_must_fail git for-each-ref --format="%(*objectname)" \
|
|
refs/tags/broken-tag-*
|
|
'
|
|
|
|
test_expect_success 'set up tag with signature and no blank lines' '
|
|
git tag -F - fake-sig-no-blanks <<-\EOF
|
|
this is the subject
|
|
-----BEGIN PGP SIGNATURE-----
|
|
not a real signature, but we just care about the
|
|
subject/body parsing. It is important here that
|
|
there are no blank lines in the signature.
|
|
-----END PGP SIGNATURE-----
|
|
EOF
|
|
'
|
|
|
|
test_atom refs/tags/fake-sig-no-blanks contents:subject 'this is the subject'
|
|
test_atom refs/tags/fake-sig-no-blanks contents:body ''
|
|
test_atom refs/tags/fake-sig-no-blanks contents:signature "$sig"
|
|
|
|
test_done
|