diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-08-25 00:54:33 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-08-25 00:54:33 +0300 |
commit | 51226147d16d59243957cb3bc1b2313f9f740725 (patch) | |
tree | 48d83a5d9e35382666920f9926b116c6d0a41251 | |
parent | 8923a45f148ba083c45935f1440e8363a37e4f0e (diff) | |
parent | 82a62015a7b55a56f779b9ddfb98a3b0552d2bb4 (diff) |
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()
-rw-r--r-- | diff.c | 2 | ||||
-rwxr-xr-x | t/t3500-cherry.sh | 23 |
2 files changed, 25 insertions, 0 deletions
@@ -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); diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh index f038f34b7c..2b8d9cb38e 100755 --- a/t/t3500-cherry.sh +++ b/t/t3500-cherry.sh @@ -55,4 +55,27 @@ test_expect_success \ expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* - .*" ' +test_expect_success 'cherry ignores whitespace' ' + git switch --orphan=upstream-with-space && + test_commit initial file && + >expect && + git switch --create=feature-without-space && + + # A spaceless file on the feature branch. Expect a match upstream. + printf space >file && + git add file && + git commit -m"file without space" && + git log --format="- %H" -1 >>expect && + + # A further change. Should not match upstream. + test_commit change file && + git log --format="+ %H" -1 >>expect && + + git switch upstream-with-space && + # Same as the spaceless file, just with spaces and on upstream. + test_commit "file with space" file "s p a c e" file-with-space && + git cherry upstream-with-space feature-without-space >actual && + test_cmp expect actual +' + test_done |