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>

diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 5a90f65b5e9d9ce21bcd0c936a01ded5065d5868..1e6dbd93b1939bb3ce01f5873a433f981aa1f236 100644 (file)
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -49,6 +49,7 @@ include::pretty-options.txt[]
 -g, \--walk-reflogs::
        Show commits as they were recorded in the reflog. The log contains
        a record about how the tip of a reference was changed.
 -g, \--walk-reflogs::
        Show commits as they were recorded in the reflog. The log contains
        a record about how the tip of a reference was changed.

+       Cannot be combined with --reverse.

        See also gitlink:git-reflog[1].
 
 --decorate::
        See also gitlink:git-reflog[1].
 
 --decorate::

diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index 1c1978140f68a5e21dec6ea8d6715b58666f8b7c..cbbc2345491841bc04f9d4dbffc61d1a896b3a48 100644 (file)
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -298,6 +298,8 @@ used in the output.  When the starting commit is specified as
 'commit@{now}', output also uses 'commit@\{timestamp}' notation
 instead.  Under '\--pretty=oneline', the commit message is
 prefixed with this information on the same line.
 'commit@{now}', output also uses 'commit@\{timestamp}' notation
 instead.  Under '\--pretty=oneline', the commit message is
 prefixed with this information on the same line.

++
+Cannot be combined with --reverse.

 
 --merge::
 
 
 --merge::
 


@@ -373,6 +375,7 @@ By default, the commits are shown in reverse chronological order.
 --reverse::
 
        Output the commits in reverse order.
 --reverse::
 
        Output the commits in reverse order.

+       Cannot be combined with --walk-reflogs.

 
 Object Traversal
 ~~~~~~~~~~~~~~~~
 
 Object Traversal
 ~~~~~~~~~~~~~~~~

diff --git a/revision.c b/revision.c
index 7d32a89b0eca858113829e9219e80ff15e66e953..51fff0ec5048478392c140a9f2b68c3650220b10 100644 (file)
--- 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);
        }
 
                compile_grep_patterns(revs->grep_filter);
        }
 

+       if (revs->reverse && revs->reflog_info)
+               die("cannot combine --reverse with --walk-reflogs");
+

        return left;
 }
 
        return left;
 }