]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jz/patch-id-hunk-header-parsing-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 18 Feb 2022 00:25:04 +0000 (16:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 18 Feb 2022 00:25:04 +0000 (16:25 -0800)
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


Trivial merge