"git diff" produces no patch text if
there is no diff, but "git apply" exits
with code 128 if the patch text is empty.
Since every valid "git diff" should
result in a successful patch application
when applied to the same preimage as
the diff, allow "git apply" to handle
these empty diffs by doing nothing and
returning 0.
Signed-off-by: Jerry Zhang <jerry@xxxxxxxxxx>
---
apply.c | 2 ++
t/t4126-apply-empty.sh | 7 +++++++
t/t7006-pager.sh | 2 +-
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/apply.c b/apply.c
index 5ea237232d..2abf2e8a61 100644
--- a/apply.c
+++ b/apply.c
@@ -4685,6 +4685,8 @@ static int apply_patch(struct apply_state *state,
state->patch_input_file = filename;
if (read_patch_file(&buf, fd) < 0)
return -128;
+ if (!buf.len)
+ goto end;
offset = 0;
while (offset < buf.len) {
struct patch *patch;
diff --git a/t/t4126-apply-empty.sh b/t/t4126-apply-empty.sh
index ceb6a79fe0..37351be609 100755
--- a/t/t4126-apply-empty.sh
+++ b/t/t4126-apply-empty.sh
@@ -31,6 +31,13 @@ test_expect_success 'apply empty' '
test_cmp expect empty
'
+test_expect_success 'apply empty diff' '
+ git reset --hard &&
+ git diff >empty.patch &&
+ git apply empty.patch &&
+ git diff | git apply -
+'
+
test_expect_success 'apply --index empty' '
git reset --hard &&
rm -f missing &&
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 0e7cf75435..2c0ada6bf6 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -567,7 +567,7 @@ test_default_pager expect_success 'git -p shortlog'
test_core_pager_subdir expect_success 'git -p shortlog'
test_core_pager_subdir expect_success test_must_fail \
- 'git -p apply </dev/null'
+ 'git -p log !'
test_expect_success TTY 'command-specific pager' '
sane_unset PAGER GIT_PAGER &&
--
2.29.0
