Skip to content

Commit df7dbab

Browse files
Denton-Lgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 177a830 commit df7dbab

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

t/t4068-diff-symmetric.sh renamed to t/t4068-diff-symmetric-merge-base.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
test_description='behavior of diff with symmetric-diff setups'
3+
test_description='behavior of diff with symmetric-diff setups and --merge-base'
44

55
. ./test-lib.sh
66

@@ -88,4 +88,13 @@ test_expect_success 'diff with ranges and extra arg' '
8888
test_i18ngrep "usage" err
8989
'
9090

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+
91100
test_done

0 commit comments

Comments
 (0)