Merge branch 'jc/am-read-author-file'

diff --git a/diff.h b/diff.h
index 2d884f1d08cc1b900d8e7e17c18b68d51041c0a6..ec76a90522ea88354882666a5a6d336dfa8963fd 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -349,7 +349,7 @@ extern int run_diff_files(struct rev_info *revs, unsigned int option);
 extern int run_diff_index(struct rev_info *revs, int cached);
 
 extern int do_diff_cache(const unsigned char *, struct diff_options *);
-extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
+extern int diff_flush_patch_id(struct diff_options *, unsigned char *, int);
 
 extern int diff_result_code(struct diff_options *, int);