summaryrefslogtreecommitdiff
path: root/attr.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2018-11-06 02:51:15 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-07 10:11:09 +0900
commit7488ba3eeaaaeb8c0e06cca12384f9f7f76082b5 (patch)
tree3e97e080b8af2a996777a91d8ccce6c82636dc19 /attr.c
parentmerge: extract verify_merge_signature() helper (diff)
downloadtgif-7488ba3eeaaaeb8c0e06cca12384f9f7f76082b5.tar.xz
merge: handle --verify-signatures for unborn branch
When git-merge sees that we are on an unborn branch (i.e., there is no HEAD), it follows a totally separate code path than the usual merge logic. This code path does not know about verify_signatures, and so we fail to notice bad or missing signatures. This has been broken since --verify-signatures was added in efed002249 (merge/pull: verify GPG signatures of commits being merged, 2013-03-31). In an ideal world, we'd unify the flow for this case with the regular merge logic, which would fix this bug and avoid introducing similar ones. But because the unborn case is so different, it would be a burden on the rest of the function to continually handle the missing HEAD. So let's just port the verification check to this special case. Reported-by: Felix Eckhofer <felix@eckhofer.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'attr.c')
0 files changed, 0 insertions, 0 deletions