diff options
| author | Lars Hjemli <hjemli@gmail.com> | 2007-11-10 16:47:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-10 19:04:24 (GMT) |
| commit | c899a57c28ee7cf251f856b575128de21b5a9a12 (patch) | |
| tree | a983ad33b599da48d9538123996bca9d14c344cd | |
| parent | a130976b71f36c73fc6279fd02beb1f798d82487 (diff) | |
| download | git-c899a57c28ee7cf251f856b575128de21b5a9a12.zip git-c899a57c28ee7cf251f856b575128de21b5a9a12.tar.gz git-c899a57c28ee7cf251f856b575128de21b5a9a12.tar.bz2 | |
for-each-ref: fix setup of option-parsing for --sort
The option value for --sort is already a pointer to a pointer to struct
ref_sort, so just use it.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin-for-each-ref.c | 2 | ||||
| -rwxr-xr-x | t/t6300-for-each-ref.sh | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c index da8c794..e909e66 100644 --- a/builtin-for-each-ref.c +++ b/builtin-for-each-ref.c @@ -847,7 +847,7 @@ int cmd_for_each_ref(int argc, const char **argv, const char *prefix) OPT_GROUP(""), OPT_INTEGER( 0 , "count", &maxcount, "show only <n> matched refs"), OPT_STRING( 0 , "format", &format, "format", "format to use for the output"), - OPT_CALLBACK(0 , "sort", &sort_tail, "key", + OPT_CALLBACK(0 , "sort", sort_tail, "key", "field name to sort on", &opt_parse_sort), OPT_END(), }; diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh index d0809eb..c722635 100755 --- a/t/t6300-for-each-ref.sh +++ b/t/t6300-for-each-ref.sh @@ -148,4 +148,26 @@ test_expect_success 'Check format "rfc2822" date fields output' ' git diff expected actual ' +cat >expected <<\EOF +refs/heads/master +refs/tags/testtag +EOF + +test_expect_success 'Verify ascending sort' ' + git-for-each-ref --format="%(refname)" --sort=refname >actual && + git diff expected actual +' + + +cat >expected <<\EOF +refs/tags/testtag +refs/heads/master +EOF + +test_expect_success 'Verify descending sort' ' + git-for-each-ref --format="%(refname)" --sort=-refname >actual && + git diff expected actual +' + + test_done |