From: Junio C Hamano Date: Tue, 9 Apr 2024 21:31:43 +0000 (-0700) Subject: Merge branch 'jc/apply-parse-diff-git-header-names-fix' X-Git-Url: https://www.git.kevux.org/?a=commitdiff_plain;h=8289a36f8725d33f5bdff2a5aeaa0b0369ad8ff8;p=rit Merge branch 'jc/apply-parse-diff-git-header-names-fix' "git apply" failed to extract the filename the patch applied to, when the change was about an empty file created in or deleted from a directory whose name ends with a SP, which has been corrected. * jc/apply-parse-diff-git-header-names-fix: t4126: fix "funny directory name" test on Windows (again) t4126: make sure a directory with SP at the end is usable apply: parse names out of "diff --git" more carefully --- 8289a36f8725d33f5bdff2a5aeaa0b0369ad8ff8