undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11

Browse Source 
"git for-each-ref" did not honor multiple "--sort=<key>" arguments
correctly.

* kk/maint-for-each-ref-multi-sort:
  for-each-ref: Fix sort with multiple keys
  t6300: test sort with multiple keys
This commit is contained in:
Junio C Hamano 2012-09-12 13:57:43 -07:00
commit 92c830dd35
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/for-each-ref.c
View File

@ -962,7 +962,9 @@ static int opt_parse_sort(const struct option *opt, const char *arg, int unset)
if (!arg) /* should --no-sort void the list ? */ if (!arg) /* should --no-sort void the list ? */
return -1; return -1;
*sort_tail = s = xcalloc(1, sizeof(*s)); s = xcalloc(1, sizeof(*s));
s->next = *sort_tail;
*sort_tail = s;
if (*arg == '-') { if (*arg == '-') {
s->reverse = 1; s->reverse = 1;

10
t/t6300-for-each-ref.sh
View File

@ -456,4 +456,14 @@ test_atom refs/tags/signed-long contents "subject line
body contents body contents
$sig" $sig"
cat >expected <<\EOF
408fe76d02a785a006c2e9c669b7be5589ede96d <committer@example.com> refs/tags/master
90b5ebede4899eda64893bc2a4c8f1d6fb6dfc40 <committer@example.com> refs/tags/bogo
EOF
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 &&
test_cmp expected actual
'
test_done test_done