threads / patch / 66903

patchfast-import: catch missing data after inline M at EOF

Subject: [PATCH] fast-import: catch missing data after inline M at EOF

## tl;dr

One message between Nov 21, 2026 and Nov 21, 2026. Diffs are folded; open one to read it.

replies: 0people: 1as markdown or json

Wonseok Oh via GitGitGadget· Nov 21, 2026, 07:40 UTC · lore
From: Wonseok Oh <marinelay7@gmail.com>

If `M <mode> inline <path>` appears at the end of input, file_change_m() exits its read loop on EOF without reading a `data` command. It then puts an uninitialized stack object ID into the tree and exits 0, leaving a tree entry for a missing blob that `git fsck` flags.

note_change_n() avoids this by calling parse_and_store_blob() at EOF, which dies on the missing `data` command. Do the same in file_change_m(), and add a test.

Signed-off-by: Wonseok Oh <marinelay7@gmail.com>
---
    fast-import: catch missing data after inline M at EOF
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2323%2Fmarinelay%2Ffast-import-inline-eof-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2323/marinelay/fast-import-inline-eof-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/2323
 builtin/fast-import.c  |  3 ++-
 t/t9300-fast-import.sh | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)
Show changes to 2 files +18 −1

builtin/fast-import.c, t/t9300-fast-import.sh

diff --git a/builtin/fast-import.c b/builtin/fast-import.c
index ab5d2a2344..2b271222e1 100644
--- a/builtin/fast-import.c
+++ b/builtin/fast-import.c
@@ -2456,8 +2456,9 @@ static void file_change_m(struct fast_import_state *state,
 		if (S_ISDIR(mode))
 			die(_("directories cannot be specified 'inline': %s"),
 				command_buf.buf);
-		while (read_next_command(state) != EOF) {
+		for (;;) {
 			const char *v;
+			read_next_command(state);
 			if (skip_prefix(command_buf.buf, "cat-blob ", &v))
 				parse_cat_blob(state, v);
 			else {
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 15f511fb6b..c291b0cf70 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -745,6 +745,22 @@ test_expect_success 'D: verify file6' '
 	test_cmp expect actual
 '
 
+test_expect_success 'D: fail on inline data cut off at end of input' '
+	cat >input <<-INPUT_END &&
+	commit refs/heads/D-inline-eof
+	committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
+	data <<COMMIT
+	inline data cut off
+	COMMIT
+
+	M 644 inline file
+	INPUT_END
+
+	test_must_fail git fast-import <input 2>err &&
+	test_grep "expected ${SQ}data n${SQ} command" err &&
+	test_must_fail git rev-parse --verify -q refs/heads/D-inline-eof
+'
+
 ###
 ### series E
 ###

base-commit: f7de81456940dd6f3274e461149bba12965de609
-- 
gitgitgadget

← back to recent threads