[PATCH 5/6] rev-list: check reflog_info before showing usage
- From
Jeff King <peff@peff.net>
- Date
- Jul 5, 2017, 08:06 UTC
- Message-ID
- <20170705080655.giw6wjsblepcf5aw@sigill.intra.peff.net>
- In-Reply-To
- <20170705075508.c5ul23vivzpklpy6@sigill.intra.peff.net>
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> --- This is actually the main "gotcha" I'm worried about with this series. I'm not sure if any other code would care about seeing the pending items in revs->commits. I still think the series is the right direction; if there is such a place, we'd want to teach it to handle reflog walking in a similar way, too.
builtin/rev-list.c | 3 ++- reflog-walk.c | 5 +++++ reflog-walk.h | 2 ++ t/t1414-reflog-walk.sh | 3 +++ 4 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/builtin/rev-list.c b/builtin/rev-list.c index 95d84d5cda..53a746dd89 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 b7e489ad32..89e719c459 100644 --- a/reflog-walk.c +++ b/reflog-walk.c @@ -358,3 +358,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 27886f793e..af32361072 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 bb847f797d..fba6788e94 100755 --- a/t/t1414-reflog-walk.sh +++ b/t/t1414-reflog-walk.sh @@ -79,5 +79,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
-- 2.13.2.892.g25f9b59978