From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 30 Jun 2017 20:45:24 +0000 (-0700)
Subject: Merge branch 'rs/apply-validate-input'
X-Git-Tag: v2.14.0-rc0~41
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=53ee6b8f1a2d7445db914e692bdf9eb2ec0cc780;p=thirdparty%2Fgit.git

Merge branch 'rs/apply-validate-input'

Tighten error checks for invalid "git apply" input.

* rs/apply-validate-input:
  apply: check git diffs for mutually exclusive header lines
  apply: check git diffs for invalid file modes
  apply: check git diffs for missing old filenames
---

53ee6b8f1a2d7445db914e692bdf9eb2ec0cc780