From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 28 Jun 2018 19:53:32 +0000 (-0700)
Subject: Merge branch 'pw/add-p-recount'
X-Git-Tag: v2.19.0-rc0~173
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5eb8da850860839bdf38ab80079eb8875b764431

Merge branch 'pw/add-p-recount'

When user edits the patch in "git add -p" and the user's editor is
set to strip trailing whitespaces indiscriminately, an empty line
that is unchanged in the patch would become completely empty
(instead of a line with a sole SP on it).  The code introduced in
Git 2.17 timeframe failed to parse such a patch, but now it learned
to notice the situation and cope with it.

* pw/add-p-recount:
add -p: fix counting empty context lines in edited patches
---

5eb8da850860839bdf38ab80079eb8875b764431