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

Merge branch 'dj/log-graph-with-no-walk'

Browse Source 
"git log --graph --no-walk A B..." is a otcnflicting request that
asks nonsense; no-walk tells us show discrete points in the
history, while graph asks to draw connections between these
discrete points. Forbid the combination.

* dj/log-graph-with-no-walk:
  revision: forbid combining --graph and --no-walk
This commit is contained in:
Junio C Hamano
2015-03-25 12:54:22 -07:00
parent 257b204f25 695985f483
commit dbd04eba01
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)" '

4
t/t4202-log.sh
View File

@ -887,4 +887,8 @@ test_expect_success GPG 'log --graph --show-signature for merged tag' '
grep "^| | gpg: Good signature" actual
'
test_expect_success 'log --graph --no-walk is forbidden' '
test_must_fail git log --graph --no-walk
'
test_done

4
t/t6014-rev-list-all.sh
View File

@ -35,4 +35,8 @@ test_expect_success 'repack does not lose detached HEAD' '
'
test_expect_success 'rev-list --graph --no-walk is forbidden' '
test_must_fail git rev-list --graph --no-walk HEAD
'
test_done

4
t/t7007-show.sh
View File

@ -124,4 +124,8 @@ test_expect_success '--quiet suppresses diff' '
test_cmp expect actual
'
test_expect_success 'show --graph is forbidden' '
test_must_fail git show --graph HEAD
'
test_done