mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

revision: forbid combining --graph and --no-walk

Browse Source 
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:
Dongcan Jiang
2015-03-11 10:13:02 +08:00
committed by Junio C Hamano
parent 9874fca712
commit 695985f483
6 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
t/t4052-stat-output.sh
View File

@ -99,7 +99,7 @@ do
test_cmp "$expect" actual
'
test "$cmd" != diff || continue
case "$cmd" in diff|show) continue;; esac
test_expect_success "$cmd --graph $verb COLUMNS (big change)" '
COLUMNS=200 git $cmd $args --graph >output
@ -127,7 +127,7 @@ do
test_cmp "$expect" actual
'
test "$cmd" != diff || continue
case "$cmd" in diff|show) continue;; esac
test_expect_success "$cmd --graph $verb not enough COLUMNS (big change)" '
COLUMNS=40 git $cmd $args --graph >output
@ -155,7 +155,7 @@ do
test_cmp "$expect" actual
'
test "$cmd" != diff || continue
case "$cmd" in diff|show) continue;; esac
test_expect_success "$cmd --graph $verb statGraphWidth config" '
git -c diff.statGraphWidth=26 $cmd $args --graph >output
@ -196,7 +196,7 @@ do
test_cmp expect actual
'
test "$cmd" != diff || continue
case "$cmd" in diff|show) continue;; esac
test_expect_success "$cmd --stat-width=width --graph with big change" '
git $cmd $args --stat-width=40 --graph >output
@ -236,7 +236,7 @@ do
test_cmp expect actual
'
test "$cmd" != diff || continue
case "$cmd" in diff|show) continue;; esac
test_expect_success "$cmd --stat=width --graph with big change is balanced" '
git $cmd $args --stat-width=60 --graph >output &&
@ -270,7 +270,7 @@ do
test_cmp "$expect" actual
'
test "$cmd" != diff || continue
case "$cmd" in diff|show) continue;; esac
test_expect_success "$cmd --graph $verb COLUMNS (long filename)" '
COLUMNS=200 git $cmd $args --graph >output
@ -299,7 +299,7 @@ do
test_cmp "$expect" actual
'
test "$cmd" != diff || continue
case "$cmd" in diff|show) continue;; esac
test_expect_success COLUMNS_CAN_BE_1 \
"$cmd --graph $verb prefix greater than COLUMNS (big change)" '