revision: forbid combining --graph and --no-walk
Because "--graph" is about connected history while --no-walk is about discrete points, it does not make sense to allow these two options at the same time. [1] This change makes a few calls to "show --graph" fail in t4052, but asking to show one commit with graph is a nonsensical thing to do. Thus, tests on "show --graph" in t4052 have been removed [2,3]. Same tests on "show" without --graph option have already been tested in 4052. 3 testcases have been added to test this patch. [1]: http://article.gmane.org/gmane.comp.version-control.git/216083 [2]: http://article.gmane.org/gmane.comp.version-control.git/264950 [3]: http://article.gmane.org/gmane.comp.version-control.git/265107 Helped-By: Eric Sunshine <sunshine@sunshineco.com> Helped-By: René Scharfe <l.s.r@web.de> Helped-By: Junio C Hamano <gitster@pobox.com> Signed-off-by: Dongcan Jiang <dongcan.jiang@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
9874fca712
commit
695985f483
@ -673,6 +673,7 @@ These options are mostly targeted for packing of Git repositories.
|
||||
given on the command line. Otherwise (if `sorted` or no argument
|
||||
was given), the commits are shown in reverse chronological order
|
||||
by commit time.
|
||||
Cannot be combined with `--graph`.
|
||||
|
||||
--do-walk::
|
||||
Overrides a previous `--no-walk`.
|
||||
@ -775,6 +776,7 @@ you would get an output like this:
|
||||
on the left hand side of the output. This may cause extra lines
|
||||
to be printed in between commits, in order for the graph history
|
||||
to be drawn properly.
|
||||
Cannot be combined with `--no-walk`.
|
||||
+
|
||||
This enables parent rewriting, see 'History Simplification' below.
|
||||
+
|
||||
|
Reference in New Issue
Block a user