From: Tanga Joris <tangajoris@gmail.com>
To: git@vger.kernel.org
Cc: siddharthasthana31@gmail.com, phillip.wood@dunelm.org.uk,
gitster@pobox.com, jackrawlings2011@gmail.com,
christian.couder@gmail.com, kaartic.sivaraam@gmail.com,
usmanakinyemi202@gmail.com, Tanga Joris <tangajoris@gmail.com>
Subject: [Outreachy PATCH v3 3/3] apply: reject new and deleted files that have both names
Date: Tue, 17 Nov 2026 03:43:48 +0300 [thread overview]
Message-ID: <20261117004348.806694-4-tangajoris@gmail.com> (raw)
In-Reply-To: <20261117004348.806694-1-tangajoris@gmail.com>
Git writes "new file mode" or "deleted file mode" before the "---"
and "+++" lines. The "new file mode" line sets is_new. Then
gitdiff_oldname() leaves old_name empty for "--- /dev/null".
When the "---" line comes first, is_new is still 0. So
gitdiff_verify_name() takes the name on that line as old_name. For
"--- /dev/null" this gives "dev/null", because one leading directory
is stripped. The "new file mode" line then sets is_new. The result is
a new file that also has an old name. "git apply --check" dies on it,
on the same assertion in check_preimage(). In the same way,
"+++ /dev/null" before "deleted file mode" gives a deleted file with
a new name. "git apply -R" dies on that one.
d70e9c5c8c (apply: check git diffs for mutually exclusive header
lines, 2017-06-27) made apply report other conflicting header lines,
instead of leaving them to an assertion. Do the same here. After the
header is read, reject a new file that has an old name. Reject a
deleted file that has a new name too. The error names the "---" or
"+++" line that came before the mode line. It does not print the
name, because for "/dev/null" that would be "dev/null".
Git always writes the mode line first, so patches made by Git are not
affected. A patch with "+++ /dev/null" before "deleted file mode" used
to apply without -R. It is now rejected too.
Helped-by: Siddharth Asthana <siddharthasthana31@gmail.com>
Signed-off-by: Tanga Joris <tangajoris@gmail.com>
---
apply.c | 18 ++++++++++++++++++
t/t4133-apply-filenames.sh | 31 +++++++++++++++++++++++++++++++
2 files changed, 49 insertions(+)
diff --git a/apply.c b/apply.c
index 77a665a71a..b920dbbbc7 100644
--- a/apply.c
+++ b/apply.c
@@ -1467,6 +1467,24 @@ int parse_git_diff_header(struct strbuf *root,
*linenr);
return -128;
}
+ if (patch->is_new > 0 && patch->old_name) {
+ if (patch_input_file)
+ error(_("git diff header has \"---\" before \"new file mode\" at %s:%d"),
+ patch_input_file, patch->extension_linenr);
+ else
+ error(_("git diff header has \"---\" before \"new file mode\" (line %d)"),
+ patch->extension_linenr);
+ return -128;
+ }
+ if (patch->is_delete > 0 && patch->new_name) {
+ if (patch_input_file)
+ error(_("git diff header has \"+++\" before \"deleted file mode\" at %s:%d"),
+ patch_input_file, patch->extension_linenr);
+ else
+ error(_("git diff header has \"+++\" before \"deleted file mode\" (line %d)"),
+ patch->extension_linenr);
+ return -128;
+ }
patch->is_toplevel_relative = 1;
return offset;
}
diff --git a/t/t4133-apply-filenames.sh b/t/t4133-apply-filenames.sh
index b6b9195924..b85dcb57bd 100755
--- a/t/t4133-apply-filenames.sh
+++ b/t/t4133-apply-filenames.sh
@@ -164,4 +164,35 @@ test_expect_success 'ignore an empty "diff --git" line before a git patch' '
test_cmp expect g
'
+for old in /dev/null a/f
+do
+ test_expect_success "reject \"--- $old\" before \"new file mode\"" '
+ cat >old_before_new.diff <<-EOF &&
+ diff --git a/f b/f
+ --- $old
+ +++ b/f
+ new file mode 100644
+ @@ -0,0 +1 @@
+ +1
+ EOF
+ test_must_fail git apply --check old_before_new.diff 2>err &&
+ test_grep "has \"---\" before \"new file mode\" at old_before_new.diff:4" err
+ '
+done
+
+test_expect_success 'reject "+++ /dev/null" before "deleted file mode"' '
+ cat >new_before_delete.diff <<-\EOF &&
+ diff --git a/f b/f
+ --- a/f
+ +++ /dev/null
+ deleted file mode 100644
+ @@ -1 +0,0 @@
+ -1
+ EOF
+ test_must_fail git apply --check new_before_delete.diff 2>err &&
+ test_grep "has \"+++\" before \"deleted file mode\" at new_before_delete.diff:4" err &&
+ test_must_fail git apply --check -R new_before_delete.diff 2>err &&
+ test_grep "has \"+++\" before \"deleted file mode\" at new_before_delete.diff:4" err
+'
+
test_done
--
2.43.0
prev parent reply other threads:[~2026-11-17 0:44 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-17 15:17 Git crashed on `git apply --check` Gingrspacecadet
2026-10-24 6:10 ` Tanga Joris
[not found] ` <CALdwsC11JHUBBTt3e_RFixLYSF0VU1C+mG7bQsO0vV=a68XHNw@mail.gmail.com>
2026-10-25 22:56 ` Tanga Joris
2026-11-07 19:54 ` [Outreachy PATCH 1/2] apply: do not keep names from an unused "diff --git" line Tanga Joris
2026-11-07 19:54 ` [Outreachy PATCH 2/2] apply: reject new and deleted files that have both names Tanga Joris
2026-11-09 10:52 ` [Outreachy PATCH 1/2] apply: do not keep names from an unused "diff --git" line Phillip Wood
2026-11-09 13:13 ` Tanga Joris
2026-11-09 14:31 ` Phillip Wood
2026-11-09 20:54 ` Tanga Joris
2026-11-09 21:06 ` Junio C Hamano
2026-11-09 23:03 ` Tanga Joris
2026-11-09 19:56 ` Junio C Hamano
2026-11-14 1:20 ` [Outreachy PATCH v2 1/2] apply: reject a patch after an empty " Tanga Joris
2026-11-14 1:20 ` [Outreachy PATCH v2 2/2] apply: reject new and deleted files that have both names Tanga Joris
2026-11-15 12:47 ` Siddharth Asthana
2026-11-16 18:06 ` Tanga Joris
2026-11-15 12:39 ` [Outreachy PATCH v2 1/2] apply: reject a patch after an empty "diff --git" line Siddharth Asthana
2026-11-16 17:54 ` Tanga Joris
2026-11-17 0:43 ` [Outreachy PATCH v3 0/3] apply: reject corrupt "diff --git" headers Tanga Joris
2026-11-17 0:43 ` [Outreachy PATCH v3 1/3] apply: free the old def_name in parse_git_diff_header() Tanga Joris
2026-11-17 0:43 ` [Outreachy PATCH v3 2/3] apply: reject a patch after an empty "diff --git" line Tanga Joris
2026-11-17 0:43 ` Tanga Joris [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261117004348.806694-4-tangajoris@gmail.com \
--to=tangajoris@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jackrawlings2011@gmail.com \
--cc=kaartic.sivaraam@gmail.com \
--cc=phillip.wood@dunelm.org.uk \
--cc=siddharthasthana31@gmail.com \
--cc=usmanakinyemi202@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox