summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Schindelin <Johannes.Schindelin@gmx.de>2006-06-23 15:36:21 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-06-23 23:55:15 (GMT)
commit8d3cbd27d46bdf42d632de0a2e7f048855941128 (patch)
treef2b26497fb551a8d4af1da01da3e09fd3b271098
parentf60349aa786d519368938d7b6e5bb2006eccb0cf (diff)
downloadgit-8d3cbd27d46bdf42d632de0a2e7f048855941128.zip
git-8d3cbd27d46bdf42d632de0a2e7f048855941128.tar.gz
git-8d3cbd27d46bdf42d632de0a2e7f048855941128.tar.bz2
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>
-rw-r--r--patch-id.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/patch-id.c b/patch-id.c
index edbc4aa..3b4c80f 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);