diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-06-24 01:06:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-24 01:06:51 -0700 |
| commit | bc1f262d67cbe1c736c5dca911f6f085f47ac9bb (patch) | |
| tree | 09d2fd4312b16cb841238edd2b5ad3a10b6f5263 /patch-id.c | |
| parent | 1f330269371cc77b7abfcc99c7b15ad7b86f09c9 (diff) | |
| parent | ce88ac5b129dd562a1062522039366ebbf1157e1 (diff) | |
| download | git-bc1f262d67cbe1c736c5dca911f6f085f47ac9bb.tar.xz | |
Merge branch 'pb/error'
* pb/error:
usage: minimum type fix.
Customizable error handlers
git-merge: Don't use -p when outputting summary
git-commit: allow -e option anywhere on command line
patch-id: take "commit" prefix as well as "diff-tree" prefix
Diffstat (limited to 'patch-id.c')
| -rw-r--r-- | patch-id.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/patch-id.c b/patch-id.c index edbc4aa3e8..3b4c80f764 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); |