Merge branch 'rs/patch-id-with-incomplete-line'

The patch-id computation did not ignore the "incomplete last line"
marker like whitespaces.

* rs/patch-id-with-incomplete-line:
  patch-id: ignore newline at end of file in diff_flush_patch_id()
This commit is contained in:
Junio C Hamano
2020-08-24 14:54:33 -07:00
2 changed files with 25 additions and 0 deletions

2
diff.c
View File

@ -6044,6 +6044,8 @@ static void patch_id_consume(void *priv, char *line, unsigned long len)
struct patch_id_t *data = priv;
int new_len;
if (len > 12 && starts_with(line, "\\ "))
return;
new_len = remove_space(line, len);
the_hash_algo->update_fn(data->ctx, line, new_len);