From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Fri, 23 Jun 2006 15:36:21 +0000 (+0200)
Subject: patch-id: take "commit" prefix as well as "diff-tree" prefix
X-Git-Tag: v1.4.1-rc2~21^2~2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8d3cbd27d46bdf42d632de0a2e7f048855941128;p=git.git

patch-id: take "commit" prefix as well as "diff-tree" prefix

Some time ago we changed git-log in a massive way, and one consequence is
that the keyword changed. Adjust patch-id for that.

[jc: as Linus suggests, allowing both old and new prefix.]

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/patch-id.c b/patch-id.c
index edbc4aa3e..3b4c80f76 100644
--- a/patch-id.c
+++ b/patch-id.c
@@ -42,6 +42,8 @@ static void generate_id_list(void)
 
 		if (!memcmp(line, "diff-tree ", 10))
 			p += 10;
+		else if (!memcmp(line, "commit ", 7))
+			p += 7;
 
 		if (!get_sha1_hex(p, n)) {
 			flush_current_id(patchlen, sha1, &ctx);