diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-05-14 08:26:09 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-14 08:26:09 +0900 |
| commit | 47fa10661746e32cbc76a88392e1cda38def27c6 (patch) | |
| tree | a2b2cd225f4b9ed50b667803ba66ff79ce740503 /t | |
| parent | Merge branch 'jk/p4-locate-branch-point-optim' (diff) | |
| parent | add: die if both --dry-run and --interactive are given (diff) | |
| download | tgif-47fa10661746e32cbc76a88392e1cda38def27c6.tar.xz | |
Merge branch 'ow/no-dryrun-in-add-i'
"git add -i --dry-run" does not dry-run, which was surprising. The
combination of options has taught to error out.
* ow/no-dryrun-in-add-i:
add: die if both --dry-run and --interactive are given
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3700-add.sh | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t3700-add.sh b/t/t3700-add.sh index dd3011430d..4086e1ebbc 100755 --- a/t/t3700-add.sh +++ b/t/t3700-add.sh @@ -349,6 +349,10 @@ test_expect_success 'git add --dry-run --ignore-missing of non-existing file out test_cmp expect.err actual.err ' +test_expect_success 'git add --dry-run --interactive should fail' ' + test_must_fail git add --dry-run --interactive +' + test_expect_success 'git add empty string should fail' ' test_must_fail git add "" ' |