diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-03-25 12:54:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-25 12:54:22 -0700 |
| commit | dbd04eba01b05baee1c4ff39d00a0d6fd33a912a (patch) | |
| tree | 9db49ea856096dadb87c503cb7e08eea0888456a /t/t4202-log.sh | |
| parent | 257b204f2537e50c8c53326d188094203cd3515f (diff) | |
| parent | 695985f4837e7299dca10b5e45206dbd2c52c1e0 (diff) | |
| download | git-dbd04eba01b05baee1c4ff39d00a0d6fd33a912a.tar.gz | |
Merge branch 'dj/log-graph-with-no-walk'
"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
Diffstat (limited to 't/t4202-log.sh')
| -rwxr-xr-x | t/t4202-log.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t4202-log.sh b/t/t4202-log.sh index 5f2b290d2b..f111705e70 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -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 |