From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 10 Jul 2017 20:59:01 +0000 (-0700)
Subject: Merge branch 'rs/apply-validate-input' into maint
X-Git-Tag: v2.13.3~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33c3c2d368d0743e300056ce0b7cfc38289e9bb4;p=thirdparty%2Fgit.git

Merge branch 'rs/apply-validate-input' into maint

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
---

33c3c2d368d0743e300056ce0b7cfc38289e9bb4