Skip to content
  • Jeff King's avatar
    merge: handle --verify-signatures for unborn branch · 7488ba3e
    Jeff King authored and Junio C Hamano's avatar Junio C Hamano committed
    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 efed0022
    
    
    (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: default avatarFelix Eckhofer <felix@eckhofer.com>
    Signed-off-by: default avatarJeff King <peff@peff.net>
    Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
    7488ba3e