From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Feb 2022 00:25:04 +0000 (-0800)
Subject: Merge branch 'jz/patch-id-hunk-header-parsing-fix'
X-Git-Tag: v2.36.0-rc0~143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d077db1df0aef3db479904429e8008d8fc0e3fb3;p=thirdparty%2Fgit.git

Merge branch 'jz/patch-id-hunk-header-parsing-fix'

Unlike "git apply", "git patch-id" did not handle patches with
hunks that has only 1 line in either preimage or postimage, which
has been corrected.

* jz/patch-id-hunk-header-parsing-fix:
  patch-id: fix scan_hunk_header on diffs with 1 line of before/after
  patch-id: fix antipatterns in tests
---

d077db1df0aef3db479904429e8008d8fc0e3fb3