Merge branch 'jc/codingstyle-compare-with-null'

[thirdparty/git.git] / t / t6300-for-each-ref.sh

diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index b3c1092338a89831206163275e32190a5e162cbd..da59fadc5d8f915cbb60cd426c58becb04e7c42a 100755 (executable)
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -650,17 +650,59 @@ test_atom refs/tags/signed-long contents "subject line
 body contents
 $sig"
 
-sort >expected <<EOF
-$(git rev-parse refs/tags/bogo) <committer@example.com> refs/tags/bogo
-$(git rev-parse refs/tags/master) <committer@example.com> refs/tags/master
-EOF
+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' '
-       git for-each-ref --format="%(objectname) %(taggeremail) %(refname)" --sort=objectname --sort=taggeremail \
-               refs/tags/bogo refs/tags/master > actual &&
+       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" &&
@@ -895,4 +937,44 @@ test_expect_success 'for-each-ref --ignore-case ignores case' '
        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