[PATCH] Don't allow combination of -g and --reverse as it doesn't work
- From
Shawn O. Pearce <spearce@spearce.org>
- Date
- Aug 20, 2007, 02:33 UTC
- Message-ID
- <20070820023343.GA16229@spearce.org>
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> ---
This addresses the "log -g --reverse horribly insane" issue I posted about earlier today. Based on Junio's reply I'm not trying to fix it for 1.5.3 but instead just tell the user it is not currently supported by the implementation.
Documentation/git-log.txt | 1 + Documentation/git-rev-list.txt | 3 +++ revision.c | 3 +++ 3 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 5a90f65..1e6dbd9 100644 --- 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. + Cannot be combined with --reverse. See also gitlink:git-reflog[1]. --decorate:: diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index 1c19781..cbbc234 100644 --- 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. ++ +Cannot be combined with --reverse. --merge:: @@ -373,6 +375,7 @@ By default, the commits are shown in reverse chronological order. --reverse:: Output the commits in reverse order. + Cannot be combined with --walk-reflogs. Object Traversal ~~~~~~~~~~~~~~~~ diff --git a/revision.c b/revision.c index 7d32a89..51fff0e 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; }
-- 1.5.3.rc5.40.g2f82