[PATCH v5 6/6] builtin: patch-id: remove unused diff-tree prefix

From: Jerry Zhang via GitGitGadget <gitgitgadget@gmail.com>
Date: Oct 24, 2022, 20:07 UTC
Message-ID: <eef2a32f008899cec6d66891f830907c26573a55.1666642065.git.gitgitgadget@gmail.com>
In-Reply-To: <pull.1359.v5.git.1666642064.gitgitgadget@gmail.com>

From: Jerry Zhang <Jerry@skydio.com>

The last git version that had "diff-tree" in the header text of "git diff-tree" output was v1.3.0 from 2006. The header text was changed from "diff-tree" to "commit" in 91539833 ("Log message printout cleanups").

Given how long ago this change was made, it is highly unlikely that anyone is still feeding in outputs from that git version.

Remove the handling of the "diff-tree" prefix and document the source of the other prefixes so that the overall functionality is more clear.

Signed-off-by: Jerry Zhang <Jerry@skydio.com>
---
 builtin/patch-id.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/builtin/patch-id.c b/builtin/patch-id.c
index afdd472369f..f840fbf1c7e 100644
--- a/builtin/patch-id.c
+++ b/builtin/patch-id.c
@@ -74,8 +74,8 @@ static int get_one_patchid(struct object_id *next_oid, struct object_id *result,
 		const char *p = line;
 		int len;
 
-		if (!skip_prefix(line, "diff-tree ", &p) &&
-		    !skip_prefix(line, "commit ", &p) &&
+		/* Possibly skip over the prefix added by "log" or "format-patch" */
+		if (!skip_prefix(line, "commit ", &p) &&
 		    !skip_prefix(line, "From ", &p) &&
 		    starts_with(line, "\\ ") && 12 < strlen(line)) {
 			if (verbatim)

-- 
gitgitgadget