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/t6014-rev-list-all.sh | |
| parent | Merge branch 'kd/rev-list-bisect-first-parent' (diff) | |
| parent | revision: forbid combining --graph and --no-walk (diff) | |
| download | tgif-dbd04eba01b05baee1c4ff39d00a0d6fd33a912a.tar.xz | |
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/t6014-rev-list-all.sh')
| -rwxr-xr-x | t/t6014-rev-list-all.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t6014-rev-list-all.sh b/t/t6014-rev-list-all.sh index 991ab4a65b..c9bedd29cb 100755 --- a/t/t6014-rev-list-all.sh +++ b/t/t6014-rev-list-all.sh @@ -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 |