summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-09-10 17:02:48 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-09-10 17:02:48 +0900
commitc2a3bb47f0a5cf8537b3d79cd01b11a5726afb02 (patch)
tree1d72a5999d2b0905b6878dd0ac64cc6928ed32f3 /builtin
parentMerge branch 'st/lib-gpg-kill-stray-agent' into maint (diff)
parentrevision: do not fallback to default when rev_input_given is set (diff)
downloadtgif-c2a3bb47f0a5cf8537b3d79cd01b11a5726afb02.tar.xz
Merge branch 'jk/rev-list-empty-input' into maint
"git log --tag=no-such-tag" showed log starting from HEAD, which has been fixed---it now shows nothing. * jk/rev-list-empty-input: revision: do not fallback to default when rev_input_given is set rev-list: don't show usage when we see empty ref patterns revision: add rev_input_given flag t6018: flesh out empty input/output rev-list tests
Diffstat (limited to 'builtin')
-rw-r--r--builtin/rev-list.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index e8f5048903..95b4128250 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -352,7 +352,8 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix)
if ((!revs.commits && reflog_walk_empty(revs.reflog_info) &&
(!(revs.tag_objects || revs.tree_objects || revs.blob_objects) &&
- !revs.pending.nr)) ||
+ !revs.pending.nr) &&
+ !revs.rev_input_given) ||
revs.diff)
usage(rev_list_usage);