[PATCH 0/3] fix pull/merge --verify-signature on an unborn branch
- From
Jeff King <peff@peff.net>
- Date
- Nov 6, 2018, 07:49 UTC
- Message-ID
- <20181106074910.GA31978@sigill.intra.peff.net>
This bug was reported to the private security list, but I don't think it's easily exploitable, since merging or pulling into an unborn branch is pretty uncommon.
The root of the issue in both commands is just that we handle unborn branches in a special code path that never learned about --verify-signatures.
[1/3]: merge: extract verify_merge_signature() helper [2/3]: merge: handle --verify-signatures for unborn branch [3/3]: pull: handle --verify-signatures for unborn branch
builtin/merge.c | 30 +++++------------------------- builtin/pull.c | 11 +++++++++++ commit.c | 26 ++++++++++++++++++++++++++ commit.h | 7 +++++++ t/t5573-pull-verify-signatures.sh | 7 +++++++ t/t7612-merge-verify-signatures.sh | 7 +++++++ 6 files changed, 63 insertions(+), 25 deletions(-)
-Peff