mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/verify-sig-merge-into-void'

Browse Source 
"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
This commit is contained in:
Junio C Hamano
2018-11-18 18:23:54 +09:00
parent 39847644ad 01a31f3bca
commit 6d2035ee60
6 changed files with 64 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
commit.h
View File

@ -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);