mirror of
https://github.com/git/git
synced 2024-09-12 21:04:12 +00:00
7c5045fc18
Commit 9e468334b4 (ref-filter: fallback on alphabetical comparison,
2015-10-30) taught ref-filter's sort to fallback to comparing refnames.
But it did it at the wrong level, overriding the comparison result for a
single "--sort" key from the user, rather than after all sort keys have
been exhausted.
This worked correctly for a single "--sort" option, but not for multiple
ones. We'd break any ties in the first key with the refname and never
evaluate the second key at all.
To make matters even more interesting, we only applied this fallback
sometimes! For a field like "taggeremail" which requires a string
comparison, we'd truly return the result of strcmp(), even if it was 0.
But for numerical "value" fields like "taggerdate", we did apply the
fallback. And that's why our multiple-sort test missed this: it uses
taggeremail as the main comparison.
So let's start by adding a much more rigorous test. We'll have a set of
commits expressing every combination of two tagger emails, dates, and
refnames. Then we can confirm that our sort is applied with the correct
precedence, and we'll be hitting both the string and value comparators.
That does show the bug, and the fix is simple: moving the fallback to
the outer compare_refs() function, after all ref_sorting keys have been
exhausted.
Note that in the outer function we don't have an "ignore_case" flag, as
it's part of each individual ref_sorting element. It's debatable what
such a fallback should do, since we didn't use the user's keys to match.
But until now we have been trying to respect that flag, so the
least-invasive thing is to try to continue to do so. Since all callers
in the current code either set the flag for all keys or for none, we can
just pull the flag from the first key. In a hypothetical world where the
user really can flip the case-insensitivity of keys separately, we may
want to extend the code to distinguish that case from a blanket
"--ignore-case".
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
914 lines
28 KiB
Bash
Executable file
914 lines
28 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 '
|
|
setdate_and_increment &&
|
|
echo "Using $datestamp" > one &&
|
|
git add one &&
|
|
git commit -m "Initial" &&
|
|
setdate_and_increment &&
|
|
git tag -a -m "Tagging at $datestamp" testtag &&
|
|
git update-ref refs/remotes/origin/master master &&
|
|
git remote add origin nowhere &&
|
|
git config branch.master.remote origin &&
|
|
git config branch.master.merge refs/heads/master &&
|
|
git remote add myfork elsewhere &&
|
|
git config remote.pushdefault myfork &&
|
|
git config push.default current
|
|
'
|
|
|
|
test_atom() {
|
|
case "$1" in
|
|
head) ref=refs/heads/master ;;
|
|
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
|
|
"
|
|
}
|
|
|
|
test_atom head refname refs/heads/master
|
|
test_atom head refname: refs/heads/master
|
|
test_atom head refname:short master
|
|
test_atom head refname:lstrip=1 heads/master
|
|
test_atom head refname:lstrip=2 master
|
|
test_atom head refname:lstrip=-1 master
|
|
test_atom head refname:lstrip=-2 heads/master
|
|
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/master
|
|
test_atom head refname:strip=2 master
|
|
test_atom head refname:strip=-1 master
|
|
test_atom head refname:strip=-2 heads/master
|
|
test_atom head upstream refs/remotes/origin/master
|
|
test_atom head upstream:short origin/master
|
|
test_atom head upstream:lstrip=2 origin/master
|
|
test_atom head upstream:lstrip=-2 origin/master
|
|
test_atom head upstream:rstrip=2 refs/remotes
|
|
test_atom head upstream:rstrip=-2 refs/remotes
|
|
test_atom head upstream:strip=2 origin/master
|
|
test_atom head upstream:strip=-2 origin/master
|
|
test_atom head push refs/remotes/myfork/master
|
|
test_atom head push:short myfork/master
|
|
test_atom head push:lstrip=1 remotes/myfork/master
|
|
test_atom head push:lstrip=-1 master
|
|
test_atom head push:rstrip=1 refs/remotes/myfork
|
|
test_atom head push:rstrip=-1 refs
|
|
test_atom head push:strip=1 remotes/myfork/master
|
|
test_atom head push:strip=-1 master
|
|
test_atom head objecttype commit
|
|
test_atom head objectsize 171
|
|
test_atom head objectname $(git rev-parse refs/heads/master)
|
|
test_atom head objectname:short $(git rev-parse --short refs/heads/master)
|
|
test_atom head objectname:short=1 $(git rev-parse --short=1 refs/heads/master)
|
|
test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master)
|
|
test_atom head tree $(git rev-parse refs/heads/master^{tree})
|
|
test_atom head parent ''
|
|
test_atom head numparent 0
|
|
test_atom head object ''
|
|
test_atom head type ''
|
|
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 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 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 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 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 154
|
|
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/master)
|
|
test_atom head objectname:short=10 $(git rev-parse --short=10 refs/heads/master)
|
|
test_atom tag tree ''
|
|
test_atom tag parent ''
|
|
test_atom tag numparent ''
|
|
test_atom tag object $(git rev-parse refs/tags/testtag^0)
|
|
test_atom tag type 'commit'
|
|
test_atom tag '*objectname' 'ea122842f48be4afb2d1fc6a4b96c05885ab7463'
|
|
test_atom tag '*objecttype' 'commit'
|
|
test_atom tag author ''
|
|
test_atom tag authorname ''
|
|
test_atom tag authoremail ''
|
|
test_atom tag authordate ''
|
|
test_atom tag committer ''
|
|
test_atom tag committername ''
|
|
test_atom tag committeremail ''
|
|
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 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 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 '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/master' '$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/master
|
|
refs/remotes/origin/master
|
|
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/master
|
|
refs/heads/master
|
|
EOF
|
|
|
|
test_expect_success 'Verify descending sort' '
|
|
git for-each-ref --format="%(refname)" --sort=-refname >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<\EOF
|
|
'refs/heads/master'
|
|
'refs/remotes/origin/master'
|
|
'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/master"
|
|
"refs/remotes/origin/master"
|
|
"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_atom head push:track '[ahead 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.master.merge refs/heads/master" &&
|
|
git config branch.master.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/master) <GREEN>master<RESET>
|
|
$(git rev-parse --short refs/remotes/origin/master) <GREEN>origin/master<RESET>
|
|
$(git rev-parse --short refs/tags/testtag) <GREEN>testtag<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/master
|
|
tags/master
|
|
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" master &&
|
|
git for-each-ref --format "%(refname:short)" refs/heads/master refs/tags/master >actual &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
cat >expected <<\EOF
|
|
heads/master
|
|
master
|
|
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/master refs/tags/master >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 master &&
|
|
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 '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 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 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 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_atom refs/tags/signed-short subject '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_atom refs/tags/signed-long subject '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 '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 'do not dereference NULL upon %(HEAD) on unborn branch' '
|
|
test_when_finished "git checkout master" &&
|
|
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_expect_success '%(trailers:unfold) unfolds trailers' '
|
|
git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual &&
|
|
{
|
|
unfold <trailers
|
|
echo
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '%(trailers:only) shows only "key: value" trailers' '
|
|
git for-each-ref --format="%(trailers:only)" refs/heads/master >actual &&
|
|
{
|
|
grep -v patch.description <trailers &&
|
|
echo
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '%(trailers:only) and %(trailers:unfold) work together' '
|
|
git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual &&
|
|
git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >reverse &&
|
|
test_cmp actual reverse &&
|
|
{
|
|
grep -v patch.description <trailers | unfold &&
|
|
echo
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '%(contents:trailers:unfold) unfolds trailers' '
|
|
git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual &&
|
|
{
|
|
unfold <trailers
|
|
echo
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '%(contents:trailers:only) shows only "key: value" trailers' '
|
|
git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual &&
|
|
{
|
|
grep -v patch.description <trailers &&
|
|
echo
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '%(contents:trailers:only) and %(contents:trailers:unfold) work together' '
|
|
git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/master >actual &&
|
|
git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >reverse &&
|
|
test_cmp actual reverse &&
|
|
{
|
|
grep -v patch.description <trailers | unfold &&
|
|
echo
|
|
} >expect &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success '%(trailers) rejects unknown trailers arguments' '
|
|
# error message cannot be checked under i18n
|
|
cat >expect <<-EOF &&
|
|
fatal: unknown %(trailers) argument: unsupported
|
|
EOF
|
|
test_must_fail git for-each-ref --format="%(trailers:unsupported)" 2>actual &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_expect_success '%(contents:trailers) rejects unknown trailers arguments' '
|
|
# error message cannot be checked under i18n
|
|
cat >expect <<-EOF &&
|
|
fatal: unknown %(trailers) argument: unsupported
|
|
EOF
|
|
test_must_fail git for-each-ref --format="%(contents:trailers:unsupported)" 2>actual &&
|
|
test_i18ncmp expect actual
|
|
'
|
|
|
|
test_expect_success 'basic atom: head contents:trailers' '
|
|
git for-each-ref --format="%(contents:trailers)" refs/heads/master >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 '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/master >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'Add symbolic ref for the following tests' '
|
|
git symbolic-ref refs/heads/sym refs/heads/master
|
|
'
|
|
|
|
cat >expected <<EOF
|
|
refs/heads/master
|
|
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/master
|
|
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
|
|
master
|
|
heads/master
|
|
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 remote add from fifth.coffee:blub &&
|
|
git config branch.master.remote from &&
|
|
git config branch.master.merge refs/heads/stable &&
|
|
git remote add to southridge.audio:repo &&
|
|
git config remote.to.push "refs/heads/*:refs/heads/pushed/*" &&
|
|
git config branch.master.pushRemote to &&
|
|
for pair in "%(upstream)=refs/remotes/from/stable" \
|
|
"%(upstream:remotename)=from" \
|
|
"%(upstream:remoteref)=refs/heads/stable" \
|
|
"%(push)=refs/remotes/to/pushed/master" \
|
|
"%(push:remotename)=to" \
|
|
"%(push:remoteref)=refs/heads/pushed/master"
|
|
do
|
|
echo "${pair#*=}" >expect &&
|
|
git for-each-ref --format="${pair%=*}" \
|
|
refs/heads/master >actual &&
|
|
test_cmp expect actual
|
|
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/MASTER >actual &&
|
|
test_must_be_empty actual &&
|
|
|
|
echo refs/heads/master >expect &&
|
|
git for-each-ref --format="%(refname)" --ignore-case \
|
|
refs/heads/MASTER >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_done
|