mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'pw/add-patch-with-suppress-blank-empty'

Browse Source 
"git add -p" by users with diff.suppressBlankEmpty set to true
failed to parse the patch that represents an unmodified empty line
with an empty line (not a line with a single space on it), which
has been corrected.

* pw/add-patch-with-suppress-blank-empty:
  add-patch: use normalize_marker() when recounting edited hunk
  add-patch: handle splitting hunks with diff.suppressBlankEmpty
This commit is contained in:
Junio C Hamano
2024-07-31 13:34:17 -07:00
parent 2794ac123d 60cf761ed1
commit d71121c060
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
add-patch.c
View File

@ -402,6 +402,12 @@ static void complete_file(char marker, struct hunk *hunk)
hunk->splittable_into++;
}
/* Empty context lines may omit the leading ' ' */
static int normalize_marker(const char *p)
{
return p[0] == '\n' || (p[0] == '\r' && p[1] == '\n') ? ' ' : p[0];
}
static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
{
struct strvec args = STRVEC_INIT;
@ -487,6 +493,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
while (p != pend) {
char *eol = memchr(p, '\n', pend - p);
const char *deleted = NULL, *mode_change = NULL;
char ch = normalize_marker(p);
if (!eol)
eol = pend;
@ -534,7 +541,7 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
* Start counting into how many hunks this one can be
* split
*/
marker = *p;
marker = ch;
} else if (hunk == &file_diff->head &&
starts_with(p, "new file")) {
file_diff->added = 1;
@ -588,10 +595,10 @@ static int parse_diff(struct add_p_state *s, const struct pathspec *ps)
(int)(eol - (plain->buf + file_diff->head.start)),
plain->buf + file_diff->head.start);
if ((marker == '-' || marker == '+') && *p == ' ')
if ((marker == '-' || marker == '+') && ch == ' ')
hunk->splittable_into++;
if (marker && *p != '\\')
marker = *p;
if (marker && ch != '\\')
marker = ch;
p = eol == pend ? pend : eol + 1;
hunk->end = p - plain->buf;
@ -815,7 +822,7 @@ static int merge_hunks(struct add_p_state *s, struct file_diff *file_diff,
(int)(hunk->end - hunk->start),
plain + hunk->start);
if (plain[overlap_end] != ' ')
if (normalize_marker(&plain[overlap_end]) != ' ')
return error(_("expected context line "
"#%d in\n%.*s"),
(int)(j + 1),
@ -955,7 +962,7 @@ static int split_hunk(struct add_p_state *s, struct file_diff *file_diff,
context_line_count = 0;
while (splittable_into > 1) {
ch = s->plain.buf[current];
ch = normalize_marker(&s->plain.buf[current]);
if (!ch)
BUG("buffer overrun while splitting hunks");
@ -1173,14 +1180,14 @@ static ssize_t recount_edited_hunk(struct add_p_state *s, struct hunk *hunk,
header->old_count = header->new_count = 0;
for (i = hunk->start; i < hunk->end; ) {
switch (s->plain.buf[i]) {
switch(normalize_marker(&s->plain.buf[i])) {
case '-':
header->old_count++;
break;
case '+':
header->new_count++;
break;
case ' ': case '\r': case '\n':
case ' ':
header->old_count++;
header->new_count++;
break;

19
t/t3701-add-interactive.sh
View File

@ -1164,4 +1164,23 @@ test_expect_success 'reset -p with unmerged files' '
test_must_be_empty staged
'
test_expect_success 'hunk splitting works with diff.suppressBlankEmpty' '
test_config diff.suppressBlankEmpty true &&
write_script fake-editor.sh <<-\EOF &&
tr F G <"$1" >"$1.tmp" &&
mv "$1.tmp" "$1"
EOF
test_write_lines a b "" c d "" e f "" >file &&
git add file &&
test_write_lines A b "" c D "" e F "" >file &&
(
test_set_editor "$(pwd)/fake-editor.sh" &&
test_write_lines s n y e q | git add -p file
) &&
git cat-file blob :file >actual &&
test_write_lines a b "" c D "" e G "" >expect &&
test_cmp expect actual
'
test_done