diff options
| author | Dongcan Jiang <dongcan.jiang@gmail.com> | 2015-03-11 02:13:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-03-19 18:07:51 (GMT) |
| commit | 695985f4837e7299dca10b5e45206dbd2c52c1e0 (patch) | |
| tree | 4dc6b51d89a4874c73a66f10b037f51218fee7bc /t/t4202-log.sh | |
| parent | 9874fca7122563e28d699a911404fc49d2a24f1c (diff) | |
| download | git-695985f4837e7299dca10b5e45206dbd2c52c1e0.zip git-695985f4837e7299dca10b5e45206dbd2c52c1e0.tar.gz git-695985f4837e7299dca10b5e45206dbd2c52c1e0.tar.bz2 | |
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>
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 99ab7ca..a980652 100755 --- a/t/t4202-log.sh +++ b/t/t4202-log.sh @@ -872,4 +872,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 |