diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-12 13:57:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-12 13:57:43 -0700 |
| commit | 92c830dd35ff6b82b7ed65de113a722813474281 (patch) | |
| tree | 91522302290399c55299d70d5e02094715818e38 | |
| parent | e09e4024a070e666ed40b66442e8151b91d623e4 (diff) | |
| parent | 3b51222ceceed022f45193db19c57cf53f0164df (diff) | |
| download | git-92c830dd35ff6b82b7ed65de113a722813474281.tar.gz git-92c830dd35ff6b82b7ed65de113a722813474281.tar.xz | |
Merge branch 'kk/maint-for-each-ref-multi-sort' into maint-1.7.11
"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
| -rw-r--r-- | builtin/for-each-ref.c | 4 | ||||
| -rwxr-xr-x | t/t6300-for-each-ref.sh | 10 |
2 files changed, 13 insertions, 1 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index b01d76a24..0c5294e5e 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -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 ? */ return -1; - *sort_tail = s = xcalloc(1, sizeof(*s)); + s = xcalloc(1, sizeof(*s)); + s->next = *sort_tail; + *sort_tail = s; if (*arg == '-') { s->reverse = 1; diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index 172178490..752f5cb7d 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -456,4 +456,14 @@ test_atom refs/tags/signed-long contents "subject line body contents $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 |