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@xxxxxxxxx>
---
...ymmetric.sh => t4068-diff-symmetric-merge-base.sh} | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
rename t/{t4068-diff-symmetric.sh => t4068-diff-symmetric-merge-base.sh} (86%)
diff --git a/t/t4068-diff-symmetric.sh b/t/t4068-diff-symmetric-merge-base.sh
similarity index 86%
rename from t/t4068-diff-symmetric.sh
rename to t/t4068-diff-symmetric-merge-base.sh
index 60c506c2b2..bd4cf254d9 100755
--- a/t/t4068-diff-symmetric.sh
+++ b/t/t4068-diff-symmetric-merge-base.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-test_description='behavior of diff with symmetric-diff setups'
+test_description='behavior of diff with symmetric-diff setups and --merge-base'
. ./test-lib.sh
@@ -88,4 +88,13 @@ test_expect_success 'diff with ranges and extra arg' '
test_i18ngrep "usage" err
'
+test_expect_success 'diff --merge-base with no commits' '
+ test_must_fail git diff --merge-base
+'
+
+test_expect_success 'diff --merge-base with three commits' '
+ test_must_fail git diff --merge-base br1 br2 master 2>err &&
+ test_i18ngrep "usage" err
+'
+
test_done
--
2.28.0.618.gf4bc123cb7
