| commit | 59f5ced65b46370a121916593cce7fcd210a15df | |
| author | Björn Gustavsson <bgustavsson@gmail.com> | |
| Sat, 6 Mar 2010 14:31:17 +0000 (6 15:31 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 7 Mar 2010 07:53:00 +0000 (6 23:53 -0800) | ||
| tree | d0cb93ec797976e9ef27e10dad6aa4ce5de9f908 | treesnapshot (tar.gz zip) |
| parent | c1376c12b781e511fd2c94c5d538b075cc1913e3 | commitdiff |
t3417: Add test cases for "rebase --whitespace=fix"
The command "git rebase --whitespace=fix HEAD~<N>" is supposed to
only clean up trailing whitespace, and the expectation is that it
cannot fail.
Unfortunately, if one commit adds a blank line at the end of a file
and a subsequent commit adds more non-blank lines after the blank
line, "git apply" (used indirectly by "git rebase") will fail to apply
the patch of the second commit.
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The command "git rebase --whitespace=fix HEAD~<N>" is supposed to
only clean up trailing whitespace, and the expectation is that it
cannot fail.
Unfortunately, if one commit adds a blank line at the end of a file
and a subsequent commit adds more non-blank lines after the blank
line, "git apply" (used indirectly by "git rebase") will fail to apply
the patch of the second commit.
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t3417-rebase-whitespace-fix.sh | [new file with mode: 0755] | blob |