t4068: add --merge-base tests
In the future, we will be adding more --merge-base tests to this test script. To prepare for that, rename the script accordingly and update its description. Also, add two basic --merge-base tests that don't require any functionality to be implemented yet. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Sep 20, 2020 at 04:22 UTC
df7dbab881c1aa697f0826d8d00f73d43815acf5
1 file changed
+10
-1
t/t4068-diff-symmetric-merge-base.sh
renamed
+10
-1
@@ -1,6 +1,6 @@
1
#!/bin/sh
2
3
-test_description='behavior of diff with symmetric-diff setups'
3
+test_description='behavior of diff with symmetric-diff setups and --merge-base'
4
5
. ./test-lib.sh
6
@@ -88,4 +88,13 @@ test_expect_success 'diff with ranges and extra arg' '
88
test_i18ngrep "usage" err
89
'
90
91
+test_expect_success 'diff --merge-base with no commits' '
92
+ test_must_fail git diff --merge-base
93
+'
94
+
95
+test_expect_success 'diff --merge-base with three commits' '
96
+ test_must_fail git diff --merge-base br1 br2 master 2>err &&
97
+ test_i18ngrep "usage" err
98
+'
99
+
100
test_done