Message ID | eef2a32f008899cec6d66891f830907c26573a55.1666642065.git.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 0d32ae8d7ffab444a83ce1db11e5341a95d109dd |
Headers | show |
Series | patch-id fixes and improvements | expand |
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)