diff options
| author | Jeff King <peff@peff.net> | 2017-07-07 09:08:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-09 17:00:48 (GMT) |
| commit | 7f97de5ee1e1f9d28f45c8f7890e752f7b12bed1 (patch) | |
| tree | eaeecf98f49cf177a3df093f70ea287da6521b31 | |
| parent | 7c2f08aa7a26e68475abe5c9fd7250aacbb6b7b2 (diff) | |
| download | git-7f97de5ee1e1f9d28f45c8f7890e752f7b12bed1.zip git-7f97de5ee1e1f9d28f45c8f7890e752f7b12bed1.tar.gz git-7f97de5ee1e1f9d28f45c8f7890e752f7b12bed1.tar.bz2 | |
rev-list: check reflog_info before showing usage
When git-rev-list sees no pending commits, it shows a usage
message. This works even when reflog-walking is requested,
because the reflog-walk code currently puts the reflog tips
into the pending queue.
In preparation for refactoring the reflog-walk code, let's
explicitly check whether we have any reflogs to walk. For
now this is a noop, but the existing reflog tests will make
sure that it kicks in after the refactoring. Likewise, we'll
add a test that "rev-list -g" without specifying any reflogs
continues to fail (so that we know our check does not kick
in too aggressively).
Note that the implementation needs to go into its own
sub-function, as the walk code does not expose its innards
outside of reflog-walk.c.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/rev-list.c | 3 | ||||
| -rw-r--r-- | reflog-walk.c | 5 | ||||
| -rw-r--r-- | reflog-walk.h | 2 | ||||
| -rwxr-xr-x | t/t1414-reflog-walk.sh | 4 |
4 files changed, 13 insertions, 1 deletions
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 95d84d5..53a746d 100644 --- a/builtin/rev-list.c +++ b/builtin/rev-list.c @@ -11,6 +11,7 @@ #include "graph.h" #include "bisect.h" #include "progress.h" +#include "reflog-walk.h" static const char rev_list_usage[] = "git rev-list [OPTION] <commit-id>... [ -- paths... ]\n" @@ -348,7 +349,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) /* Only --header was specified */ revs.commit_format = CMIT_FMT_RAW; - if ((!revs.commits && + if ((!revs.commits && reflog_walk_empty(revs.reflog_info) && (!(revs.tag_objects || revs.tree_objects || revs.blob_objects) && !revs.pending.nr)) || revs.diff) diff --git a/reflog-walk.c b/reflog-walk.c index 081f89b..98c2f42 100644 --- a/reflog-walk.c +++ b/reflog-walk.c @@ -365,3 +365,8 @@ void show_reflog_message(struct reflog_walk_info *reflog_info, int oneline, strbuf_release(&selector); } } + +int reflog_walk_empty(struct reflog_walk_info *info) +{ + return !info || !info->reflogs.nr; +} diff --git a/reflog-walk.h b/reflog-walk.h index 27886f7..af32361 100644 --- a/reflog-walk.h +++ b/reflog-walk.h @@ -20,4 +20,6 @@ extern void get_reflog_selector(struct strbuf *sb, const struct date_mode *dmode, int force_date, int shorten); +extern int reflog_walk_empty(struct reflog_walk_info *walk); + #endif diff --git a/t/t1414-reflog-walk.sh b/t/t1414-reflog-walk.sh index 945aa08..8bda862 100755 --- a/t/t1414-reflog-walk.sh +++ b/t/t1414-reflog-walk.sh @@ -102,4 +102,8 @@ test_expect_failure 'walk prefers reflog to ref tip' ' test_cmp expect actual ' +test_expect_success 'rev-list -g complains when there are no reflogs' ' + test_must_fail git rev-list -g +' + test_done |