git/list[1] front-page[2] threads[3] people[4] search[5] about
 

[PATCH v2 3/3] object-file-convert: copy unknown commit headers unchanged

From
Adrian Ratiu <adrian.ratiu@collabora.com>
Date
Nov 19, 2026, 14:18 UTC
Message-ID
<26080a7a386bdd0ae14725d2e731d1be81774d49.1794932695.git.adrian.ratiu@collabora.com>
In-Reply-To
<cover.1794932695.git.adrian.ratiu@collabora.com>

In a repo with extensions.compatObjectFormat, Git converts commits to the compat format in two places which disagree about headers they don't know:

1. When a commit is created with commit_tree_extended(), as
   git-commit(1) does, convert_commit_extra_headers() copies unknown
   headers unchanged.
2. When an existing commit object is converted (git-hash-object(1) -w)
   or when it's read by its compat ID, convert_commit_object() fails
   on them instead.
So git-hash-object(1) refuses such a commit, while "git commit --amend"
records a compat ID for it that can't be read back:
   "Failed to convert object from sha256 to sha1".

The rejection was added in 08a45903cb (object-file-convert: convert commits that embed signed tags, 2023-10-01). Git can't know what an unknown header holds. It might hold an object ID that needs converting, so convert_commit_object() rejects all of them.

Some tools rely on such headers though. Jujutsu, for example, writes a "change-id" header in every commit, so none of its commits can be converted.

Make convert_commit_object() copy unknown headers and their continuation lines unchanged, just like convert_commit_extra_headers(), so both give the same compat object.

The author, committer, encoding and gpgsig headers were already copied the same, so their separate cases are no longer needed.

The "tree ", "parent " and "mergetag " cases only matched a line with something after the space. That didn't matter while all other lines were rejected, but they would now be copied. For a "mergetag " line whose tag starts on the next line, the object ID in the tag would be copied unconverted, even though Git reads that header as a mergetag and convert_commit_extra_headers() refuses to convert it.

Match these headers by their key alone instead, the way read_commit_extra_header_lines() does. Such a line with an empty or bad value is then rejected, as before. A "tree", "parent" or "mergetag" line without a space is not one of these headers to Git, so it is copied like any other unknown header, which is also what convert_commit_extra_headers() does.

Alternatives considered:
 - Reject unknown headers in convert_commit_extra_headers() too.
   Both paths would then agree, but commits from tools that add
   their own headers could not be used in a compat repo.
 - Copy only headers known to hold no object IDs. Every tool would
   first need to get its headers added to that list.
 - Convert values that look like object IDs. Any other hex string
   could be taken for one, and Git shouldn't interpret headers it
   doesn't know.
 - Also reject lines that don't look like "<key> <value>". This would
   make the two paths disagree again, because
   convert_commit_extra_headers() copies such lines, so
   "git commit --amend" would record compat IDs that can't be read
   back.
Signed-off-by: Adrian Ratiu <adrian.ratiu@collabora.com>
---
 object-file-convert.c         | 35 ++++++++++++++++++++++-------------
 t/t1016-compatObjectFormat.sh | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 13 deletions(-)
diff --git a/object-file-convert.c b/object-file-convert.c
index 63ee18630b..ae21eedc3d 100644
--- a/object-file-convert.c
+++ b/object-file-convert.c
@@ -167,7 +167,7 @@ static int convert_commit_object(struct repository *repo,
 		if (!eol)
 			return error(_("bad %s in commit"), "line");
 
-		if (((bufptr + 5) < eol) && !memcmp(bufptr, "tree ", 5))
+		if (((bufptr + 5) <= eol) && !memcmp(bufptr, "tree ", 5))
 		{
 			if (((bufptr + tree_entry_len) != eol) ||
 			    parse_oid_hex_algop(bufptr + 5, &oid, &p, from) ||
@@ -179,7 +179,7 @@ static int convert_commit_object(struct repository *repo,
 					     "tree", oid_to_hex(&oid));
 			strbuf_addf(out, "tree %s\n", oid_to_hex(&mapped_oid));
 		}
-		else if (((bufptr + 7) < eol) && !memcmp(bufptr, "parent ", 7))
+		else if (((bufptr + 7) <= eol) && !memcmp(bufptr, "parent ", 7))
 		{
 			if (((bufptr + parent_entry_len) != eol) ||
 			    parse_oid_hex_algop(bufptr + 7, &oid, &p, from) ||
@@ -192,7 +192,7 @@ static int convert_commit_object(struct repository *repo,
 
 			strbuf_addf(out, "parent %s\n", oid_to_hex(&mapped_oid));
 		}
-		else if (((bufptr + 9) < eol) && !memcmp(bufptr, "mergetag ", 9))
+		else if (((bufptr + 9) <= eol) && !memcmp(bufptr, "mergetag ", 9))
 		{
 			struct strbuf tag = STRBUF_INIT, new_tag = STRBUF_INIT;
 
@@ -223,17 +223,26 @@ static int convert_commit_object(struct repository *repo,
 			strbuf_release(&tag);
 			strbuf_release(&new_tag);
 		}
-		else if (((bufptr + 7) < tail) && !memcmp(bufptr, "author ", 7))
-			strbuf_add(out, bufptr, (eol - bufptr) + 1);
-		else if (((bufptr + 10) < tail) && !memcmp(bufptr, "committer ", 10))
-			strbuf_add(out, bufptr, (eol - bufptr) + 1);
-		else if (((bufptr + 9) < tail) && !memcmp(bufptr, "encoding ", 9))
-			strbuf_add(out, bufptr, (eol - bufptr) + 1);
-		else if (((bufptr + 6) < tail) && !memcmp(bufptr, "gpgsig", 6))
-			strbuf_add(out, bufptr, (eol - bufptr) + 1);
 		else {
-			/* Unknown line fail it might embed an oid */
-			return -1;
+			/*
+			 * Copy all other headers unchanged. author, committer,
+			 * encoding and gpgsig hold no object IDs. For unknown
+			 * headers we can't tell, so copy them too, like
+			 * convert_commit_extra_headers() does when the commit
+			 * is written. Both must give the same compat object.
+			 *
+			 * This means that a header holding object IDs is
+			 * copied without converting them. Any such header added
+			 * to Git needs its own case above, like parent or
+			 * mergetag, and the same conversion in
+			 * convert_commit_extra_headers().
+			 *
+			 * The cases above match a header by its key alone, as
+			 * read_commit_extra_header_lines() does, so that e.g. a
+			 * "mergetag " line with nothing after the space is
+			 * still handled as a mergetag instead of being copied.
+			 */
+			strbuf_add(out, bufptr, (eol - bufptr) + 1);
 		}
 		/* Consume any trailing continuation lines */
 		bufptr = eol + 1;
diff --git a/t/t1016-compatObjectFormat.sh b/t/t1016-compatObjectFormat.sh
index 9cafcee509..fdb882c686 100755
--- a/t/t1016-compatObjectFormat.sh
+++ b/t/t1016-compatObjectFormat.sh
@@ -188,6 +188,38 @@ do
 		eval signedtag4_${hash}_oid=$(git hash-object -t tag -w ../${hash}_signedtag4)
 	'
 
+	test_expect_success "create a $hash commit with an unknown header" '
+		git cat-file commit $(commit2_oid $hash) >../${hash}_commit2 &&
+		awk "{ print } /^committer / { print \"x-unknown one\"; print \" two\" }" \
+			<../${hash}_commit2 >../${hash}_unknownheader &&
+		oid=$(git hash-object -t commit -w ../${hash}_unknownheader) &&
+		eval unknownheader_${hash}_oid=$oid &&
+		git branch unknownheader $oid
+	'
+
+	test_expect_success "amend a $hash commit with an unknown header" '
+		git checkout unknownheader &&
+		git commit --amend -m "Amend a commit with an unknown header" &&
+		git cat-file commit HEAD >actual &&
+		test_grep "^x-unknown one$" actual &&
+		oid=$(git rev-parse HEAD) &&
+		eval unknownheader2_${hash}_oid=$oid
+	'
+
+	test_expect_success "reject a $hash commit with an empty mergetag line" '
+		git cat-file tag committag >../${hash}_committag &&
+		{
+			sed -n "/^committer /q;p" ../${hash}_commit2 &&
+			grep "^committer " ../${hash}_commit2 &&
+			echo "mergetag " &&
+			sed "s/^/ /" ../${hash}_committag &&
+			echo &&
+			echo message
+		} >../${hash}_emptymergetag &&
+		test_must_fail git hash-object -t commit -w ../${hash}_emptymergetag 2>err &&
+		test_grep "Failed to convert object" err
+	'
+
 	test_expect_success 'rev-parse maps oid of object borrowed from alternate' '
 		for repo in alt borrow
 		do
@@ -298,6 +330,8 @@ compare_oids 'blob' more "$more_sha1_oid" "$more_sha256_oid"
 compare_oids 'blob' another "$another_sha1_oid" "$another_sha256_oid"
 compare_oids 'tree' tree2 "$tree2_sha1_oid" "$tree2_sha256_oid"
 compare_oids 'commit' commit2 "$commit2_sha1_oid" "$commit2_sha256_oid"
+compare_oids 'commit' unknownheader "$unknownheader_sha1_oid" "$unknownheader_sha256_oid"
+compare_oids 'commit' unknownheader2 "$unknownheader2_sha1_oid" "$unknownheader2_sha256_oid"
 compare_oids GPG2 'tag' signedtag2 "$signedtag2_sha1_oid" "$signedtag2_sha256_oid"
 compare_oids GPG2 'commit' signedcommit2 "$signedcommit2_sha1_oid" "$signedcommit2_sha256_oid"
 compare_oids GPG2 'commit' signedcommit3 "$signedcommit3_sha1_oid" "$signedcommit3_sha256_oid"
-- 
2.56.1
Previous: Adrian Ratiu
Message 14 of 14 in “compatObjectFormat: fix a BUG(), wrong id and unknown headers”
  1. 0/3 compatObjectFormat: fix a BUG(), wrong id and unknown headersAdrian Ratiu, Nov 12, 2026
  2. 1/3 setup: reject compatObjectFormat == objectFormatAdrian Ratiu, Nov 12, 2026
  3. Patrick SteinhardtNov 16, 2026
  4. Adrian RatiuNov 17, 2026
  5. 2/3 rev-parse: die when --output-object-format cannot map an objectAdrian Ratiu, Nov 12, 2026
  6. Patrick SteinhardtNov 16, 2026
  7. Adrian RatiuNov 17, 2026
  8. 3/3 object-file-convert: copy unknown commit headers unchangedAdrian Ratiu, Nov 12, 2026
  9. Patrick SteinhardtNov 16, 2026
  10. Adrian RatiuNov 17, 2026
  11. 0/3 compatObjectFormat: fix a BUG(), wrong ID and unknown headersAdrian Ratiu, Nov 19, 2026
  12. 1/3 setup: reject compatObjectFormat == objectFormatAdrian Ratiu, Nov 19, 2026
  13. 2/3 rev-parse: die when --output-object-format cannot map an objectAdrian Ratiu, Nov 19, 2026
  14. 3/3 object-file-convert: copy unknown commit headers unchangedAdrian Ratiu, Nov 19, 2026

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.