[PATCH v4 6/6] builtin: patch-id: remove unused diff-tree prefix
From: Jerry Zhang via GitGitGadget <hidden>
Date: 2022-10-20 23:17:22
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Jerry Zhang <redacted> From a "git grep" of the repo, no command, including diff-tree itself, produces diff output with "diff-tree " prefixed in the header. Thus remove its handling in "patch-id". Signed-off-by: Jerry Zhang <redacted> --- 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