Skip to content

Commit 82fd0f4

Browse files
peffgitster
authored andcommitted
revision: disallow reflog walking with revs->limited
The reflog-walk code doesn't work with limit_list(). That function traverses down the real history graph, not the fake reflog history that get_revision() returns. So it's not going to actually examine all of the commits we're going to show, because we'd add them to the pending list only during the actual traversal. In practice this limitation doesn't really matter, because the options that require list-limiting generally need UNINTERESTING endpoints or symmetric ranges, which already are forbidden for reflog walks. Still, there are likely some corner cases that would behave oddly. We're better off to warn the user that we can't fulfill their request than to generate potentially wrong output. This will also make it easier to refactor the reflog-walking code, because it eliminates a whole area of corner cases we'd have to consider (that already don't work anyway). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 7cf686b commit 82fd0f4

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

revision.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2366,6 +2366,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
23662366

23672367
if (revs->reverse && revs->reflog_info)
23682368
die("cannot combine --reverse with --walk-reflogs");
2369+
if (revs->reflog_info && revs->limited)
2370+
die("cannot combine --walk-reflogs with history-limiting options");
23692371
if (revs->rewrite_parents && revs->children.name)
23702372
die("cannot combine --parents and --children");
23712373

0 commit comments

Comments
 (0)