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 /builtin | |
| 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
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/for-each-ref.c | 4 |
1 files changed, 3 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; |