diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-08-31 15:39:10 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-08-31 15:39:10 -0700 |
commit | e95c3fb54fd43b5fca47bcfd946c3a009752cf3a (patch) | |
tree | 9babbe452473cf3f074df8ebc08b19aa9a36cf29 /builtin | |
parent | b21089db6a6006bcf9233f0d8592044ca5553c6a (diff) | |
parent | 2bd07065c3ed8a1bd2dc6f5d8e914dfec31e3dca (diff) | |
download | git-e95c3fb54fd43b5fca47bcfd946c3a009752cf3a.tar.gz |
Merge branch 'sg/describe-contains'
"git describe" without argument defaulted to describe the HEAD
commit, but "git describe --contains" didn't. Arguably, in a
repository used for active development, such defaulting would not
be very useful as the tip of branch is typically not tagged, but it
is better to be consistent.
* sg/describe-contains:
describe --contains: default to HEAD when no commit-ish is given
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/describe.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/builtin/describe.c b/builtin/describe.c index a36c829e57..7df554326b 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -443,10 +443,10 @@ int cmd_describe(int argc, const char **argv, const char *prefix) if (pattern) argv_array_pushf(&args, "--refs=refs/tags/%s", pattern); } - while (*argv) { - argv_array_push(&args, *argv); - argv++; - } + if (argc) + argv_array_pushv(&args, argv); + else + argv_array_push(&args, "HEAD"); return cmd_name_rev(args.argc, args.argv, prefix); } |