diff options
| author |  Denton Liu <liu.denton@gmail.com> | 2020-09-20 04:22:24 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-09-20 21:30:26 -0700 |
| commit | df7dbab881c1aa697f0826d8d00f73d43815acf5 (patch) | |
| tree | a5417db745f58de2a85200d37fac0ab22ae76ce1 /t | |
| parent | diff-lib: define diff_get_merge_base() (diff) | |
| download | tgif-df7dbab881c1aa697f0826d8d00f73d43815acf5.tar.xz | |
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>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4068-diff-symmetric-merge-base.sh (renamed from t/t4068-diff-symmetric.sh) | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/t/t4068-diff-symmetric.sh b/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 |