summaryrefslogtreecommitdiff
path: root/t/t7007-show.sh
diff options
context:
space:
mode:
authorDongcan Jiang <dongcan.jiang@gmail.com>2015-03-11 02:13:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-19 18:07:51 (GMT)
commit695985f4837e7299dca10b5e45206dbd2c52c1e0 (patch)
tree4dc6b51d89a4874c73a66f10b037f51218fee7bc /t/t7007-show.sh
parent9874fca7122563e28d699a911404fc49d2a24f1c (diff)
downloadgit-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/t7007-show.sh')
-rwxr-xr-xt/t7007-show.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t7007-show.sh b/t/t7007-show.sh
index 1b824fe..42d3db6 100755
--- a/t/t7007-show.sh
+++ b/t/t7007-show.sh
@@ -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