diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-11-18 09:23:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 09:23:56 (GMT) |
| commit | bda53f4185b8f7d2197176fe83afcb8d5f47368b (patch) | |
| tree | 3db4c003ea5af15f7bff6246dfe6084636096be5 /t | |
| parent | c72431ffc9b48e8b9009e1f95afa9db9d87b099a (diff) | |
| parent | 22cb3835b90f80b2de2bc8f5ff3a9e8eed5ff40a (diff) | |
| download | git-bda53f4185b8f7d2197176fe83afcb8d5f47368b.zip git-bda53f4185b8f7d2197176fe83afcb8d5f47368b.tar.gz git-bda53f4185b8f7d2197176fe83afcb8d5f47368b.tar.bz2 | |
Merge branch 'js/apply-recount-allow-noop'
When editing a patch in a "git add -i" session, a hunk could be
made to no-op. The "git apply" program used to reject a patch with
such a no-op hunk to catch user mistakes, but it is now updated to
explicitly allow a no-op hunk in an edited patch.
* js/apply-recount-allow-noop:
apply --recount: allow "no-op hunks"
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4136-apply-check.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t4136-apply-check.sh b/t/t4136-apply-check.sh index 6d92872..4c3f264 100755 --- a/t/t4136-apply-check.sh +++ b/t/t4136-apply-check.sh @@ -29,6 +29,18 @@ test_expect_success 'apply exits non-zero with no-op patch' ' test_must_fail git apply --check input ' +test_expect_success '`apply --recount` allows no-op patch' ' + echo 1 >1 && + git apply --recount --check <<-\EOF + diff --get a/1 b/1 + index 6696ea4..606eddd 100644 + --- a/1 + +++ b/1 + @@ -1,1 +1,1 @@ + 1 + EOF +' + test_expect_success 'invalid combination: create and copy' ' test_must_fail git apply --check - <<-\EOF diff --git a/1 b/2 |