development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-08-27 11:39:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

t4068: add --merge-base tests

Browse source 
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>
This commit is contained in:
Denton Liu 2020-09-20 04:22:24 -07:00 committed by Junio C Hamano
parent 177a830268
commit df7dbab881
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
t/t4068-diff-symmetric.sh → t/t4068-diff-symmetric-merge-base.sh
View file

@ -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