diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2007-08-19 22:33:43 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-08-19 22:52:06 -0700 |
| commit | d56651c0ef1c81c1d0509ea4464451d5724e4036 (patch) | |
| tree | df92643fe2350dc8986a3ce7039e5c2ec9b28689 /revision.c | |
| parent | 14cd56071520c3bb37252c8d0abe81c841465378 (diff) | |
| download | git-d56651c0ef1c81c1d0509ea4464451d5724e4036.tar.gz git-d56651c0ef1c81c1d0509ea4464451d5724e4036.tar.xz | |
Don't allow combination of -g and --reverse as it doesn't work
The --walk-reflogs logic and the --reverse logic are completely
incompatible with one another. Attempting to use both at the same
time leads to confusing results that sometimes violates the user's
formatting options or ignores the user's request to see the reflog
message and timestamp.
Unfortunately the implementation of both of these features is glued
onto the side of the revision walking machinary in such a way that
they are probably not going to be easy to make them compatible with
each other. Rather than offering the user confusing results we are
better off bailing out with an error message until such a time as
the implementations can be refactored to be compatible.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
| -rw-r--r-- | revision.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/revision.c b/revision.c index 7d32a89b0..51fff0ec5 100644 --- a/revision.c +++ b/revision.c @@ -1277,6 +1277,9 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch compile_grep_patterns(revs->grep_filter); } + if (revs->reverse && revs->reflog_info) + die("cannot combine --reverse with --walk-reflogs"); + return left; } |