diff options
Diffstat (limited to 'third_party/git/t/t3417-rebase-whitespace-fix.sh')
| -rwxr-xr-x | third_party/git/t/t3417-rebase-whitespace-fix.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/git/t/t3417-rebase-whitespace-fix.sh b/third_party/git/t/t3417-rebase-whitespace-fix.sh index e85cdc7037..946e92f8da 100755 --- a/third_party/git/t/t3417-rebase-whitespace-fix.sh +++ b/third_party/git/t/t3417-rebase-whitespace-fix.sh @@ -52,7 +52,7 @@ test_expect_success 'blank line at end of file; extend at end of file' ' git commit --allow-empty -m "Initial empty commit" && git add file && git commit -m first && mv second file && - git add file && git commit -m second && + git add file && git commit -m second && git rebase --whitespace=fix HEAD^^ && git diff --exit-code HEAD^:file expect-first && test_cmp expect-second file @@ -118,7 +118,7 @@ test_expect_success 'at beginning of file' ' for i in 1 2 3 4 5; do echo $i done >> file && - git commit -m more file && + git commit -m more file && git rebase --whitespace=fix HEAD^^ && test_cmp expect-beginning file ' |