Merge branch 'rs/hex2chr' into maint

diff --git a/patch-ids.h b/patch-ids.h
index dea1ecda48ba7a43cc56e103eec61d8e12bedd10..0f34ea11eadffea14620ea2ad45d69894469aef7 100644 (file)
--- a/patch-ids.h
+++ b/patch-ids.h
@@ -13,7 +13,7 @@ struct patch_ids {
 };
 
 int commit_patch_id(struct commit *commit, struct diff_options *options,
-                   unsigned char *sha1);
+                   unsigned char *sha1, int);
 int init_patch_ids(struct patch_ids *);
 int free_patch_ids(struct patch_ids *);
 struct patch_id *add_commit_patch_id(struct commit *, struct patch_ids *);