path: root/commit.h
diff options
authorJunio C Hamano <>2018-11-18 09:23:54 (GMT)
committerJunio C Hamano <>2018-11-18 09:23:54 (GMT)
commit6d2035ee605980efa9915e10d35e7a355fc74077 (patch)
tree5d33f09a10185d66398070e26bcaf864f55709bd /commit.h
parent39847644adb3678da91048b2ac6ebc2b3c475f3a (diff)
parent01a31f3bcaae8b62e5e11ee12d7b1606700f0721 (diff)
Merge branch 'jk/verify-sig-merge-into-void'
"git merge" and "git pull" that merges into an unborn branch used to completely ignore "--verify-signatures", which has been corrected. * jk/verify-sig-merge-into-void: pull: handle --verify-signatures for unborn branch merge: handle --verify-signatures for unborn branch merge: extract verify_merge_signature() helper
Diffstat (limited to 'commit.h')
1 files changed, 8 insertions, 0 deletions
diff --git a/commit.h b/commit.h
index 03ab195..9866453 100644
--- a/commit.h
+++ b/commit.h
@@ -340,6 +340,14 @@ void record_author_date(struct author_date_slab *author_date,
struct commit *commit);
int compare_commits_by_author_date(const void *a_, const void *b_, void *unused);
+ * Verify a single commit with check_commit_signature() and die() if it is not
+ * a good signature. This isn't really suitable for general use, but is a
+ * helper to implement consistent logic for pull/merge --verify-signatures.
+ */
+void verify_merge_signature(struct commit *commit, int verbose);
int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);