diff options
| author | Kacper Kornet <draenog@pld-linux.org> | 2012-08-21 09:47:26 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-21 14:42:12 -0700 |
| commit | 3b51222ceceed022f45193db19c57cf53f0164df (patch) | |
| tree | e68d79593a8252f033cf5d0ca527a6a9228cf6fb | |
| parent | 912072d53a6f257fbbfd8a103e14248ae2382b6d (diff) | |
| download | git-3b51222ceceed022f45193db19c57cf53f0164df.tar.gz | |
for-each-ref: Fix sort with multiple keys
The linked list describing sort options was not correctly set up in
opt_parse_sort. In the result, contrary to the documentation, only the
last of multiple --sort options to git-for-each-ref was taken into
account. This commit fixes it.
Signed-off-by: Kacper Kornet <draenog@pld-linux.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/for-each-ref.c | 4 | ||||
| -rwxr-xr-x | t/t6300-for-each-ref.sh | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index b01d76a243..0c5294e5e8 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 a0d82d4937..752f5cb7d0 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -461,7 +461,7 @@ cat >expected <<\EOF 90b5ebede4899eda64893bc2a4c8f1d6fb6dfc40 <committer@example.com> refs/tags/bogo EOF -test_expect_failure 'Verify sort with multiple keys' ' +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 |