mirror of
https://github.com/git/git.git
synced 2026-03-14 02:43:25 +01:00
Merge branch 'bg/apply-fix-blank-at-eof' into next
* bg/apply-fix-blank-at-eof: t3417: Add test cases for "rebase --whitespace=fix" t4124: Add additional tests of --whitespace=fix apply: Allow blank context lines to match beyond EOF apply: Remove the quick rejection test apply: Don't unnecessarily update line lengths in the preimage
This commit is contained in:
Junio C Hamano
126
t/t3417-rebase-whitespace-fix.sh
Executable file
126
t/t3417-rebase-whitespace-fix.sh
Executable file
@@ -0,0 +1,126 @@
|
||||
#!/bin/sh
|
||||
|
||||
test_description='git rebase --whitespace=fix
|
||||
|
||||
This test runs git rebase --whitespace=fix and make sure that it works.
|
||||
'
|
||||
|
||||
. ./test-lib.sh
|
||||
|
||||
# prepare initial revision of "file" with a blank line at the end
|
||||
cat >file <<EOF
|
||||
a
|
||||
b
|
||||
c
|
||||
|
||||
EOF
|
||||
|
||||
# expected contents in "file" after rebase
|
||||
cat >expect-first <<EOF
|
||||
a
|
||||
b
|
||||
c
|
||||
EOF
|
||||
|
||||
# prepare second revision of "file"
|
||||
cat >second <<EOF
|
||||
a
|
||||
b
|
||||
c
|
||||
|
||||
d
|
||||
e
|
||||
f
|
||||
|
||||
|
||||
|
||||
|
||||
EOF
|
||||
|
||||
# expected contents in second revision after rebase
|
||||
cat >expect-second <<EOF
|
||||
a
|
||||
b
|
||||
c
|
||||
|
||||
d
|
||||
e
|
||||
f
|
||||
EOF
|
||||
|
||||
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 rebase --whitespace=fix HEAD^^ &&
|
||||
git diff --exit-code HEAD^:file expect-first &&
|
||||
test_cmp file expect-second
|
||||
'
|
||||
|
||||
# prepare third revision of "file"
|
||||
sed -e's/Z//' >third <<EOF
|
||||
a
|
||||
b
|
||||
c
|
||||
|
||||
d
|
||||
e
|
||||
f
|
||||
Z
|
||||
Z
|
||||
h
|
||||
i
|
||||
j
|
||||
k
|
||||
l
|
||||
EOF
|
||||
|
||||
sed -e's/ //g' <third >expect-third
|
||||
|
||||
test_expect_success 'two blanks line at end of file; extend at end of file' '
|
||||
cp third file && git add file && git commit -m third &&
|
||||
git rebase --whitespace=fix HEAD^^ &&
|
||||
git diff --exit-code HEAD^:file expect-second &&
|
||||
test_cmp file expect-third
|
||||
'
|
||||
|
||||
test_expect_success 'same, but do not remove trailing spaces' '
|
||||
git config core.whitespace "-blank-at-eol" &&
|
||||
git reset --hard HEAD^ &&
|
||||
cp third file && git add file && git commit -m third &&
|
||||
git rebase --whitespace=fix HEAD^^
|
||||
git diff --exit-code HEAD^:file expect-second &&
|
||||
test_cmp file third
|
||||
'
|
||||
|
||||
sed -e's/Z//' >beginning <<EOF
|
||||
a
|
||||
Z
|
||||
Z
|
||||
EOF
|
||||
|
||||
cat >expect-beginning <<EOF
|
||||
a
|
||||
|
||||
|
||||
1
|
||||
2
|
||||
3
|
||||
4
|
||||
5
|
||||
EOF
|
||||
|
||||
test_expect_success 'at beginning of file' '
|
||||
git config core.whitespace "blank-at-eol" &&
|
||||
cp beginning file &&
|
||||
git commit -m beginning file &&
|
||||
for i in 1 2 3 4 5; do
|
||||
echo $i
|
||||
done >> file &&
|
||||
git commit -m more file &&
|
||||
git rebase --whitespace=fix HEAD^^ &&
|
||||
test_cmp file expect-beginning
|
||||
'
|
||||
|
||||
test_done
|
||||
@@ -134,4 +134,13 @@ test_expect_success 'two lines' '
|
||||
|
||||
'
|
||||
|
||||
test_expect_success 'apply patch with 3 context lines matching at end' '
|
||||
{ echo a; echo b; echo c; echo d; } >file &&
|
||||
git add file &&
|
||||
echo e >>file &&
|
||||
git diff >patch &&
|
||||
>file &&
|
||||
test_must_fail git apply patch
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
@@ -261,4 +261,174 @@ test_expect_success 'blank but not empty at EOF' '
|
||||
grep "new blank line at EOF" error
|
||||
'
|
||||
|
||||
test_expect_success 'applying beyond EOF requires one non-blank context line' '
|
||||
{ echo; echo; echo; echo; } >one &&
|
||||
git add one &&
|
||||
{ echo b; } >>one &&
|
||||
git diff -- one >patch &&
|
||||
|
||||
git checkout one &&
|
||||
{ echo a; echo; } >one &&
|
||||
cp one expect &&
|
||||
test_must_fail git apply --whitespace=fix patch &&
|
||||
test_cmp one expect &&
|
||||
test_must_fail git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
'
|
||||
|
||||
test_expect_success 'tons of blanks at EOF should not apply' '
|
||||
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
|
||||
echo; echo; echo; echo;
|
||||
done >one &&
|
||||
git add one &&
|
||||
echo a >>one &&
|
||||
git diff -- one >patch &&
|
||||
|
||||
>one &&
|
||||
test_must_fail git apply --whitespace=fix patch &&
|
||||
test_must_fail git apply --ignore-space-change --whitespace=fix patch
|
||||
'
|
||||
|
||||
test_expect_success 'missing blank line at end with --whitespace=fix' '
|
||||
echo a >one &&
|
||||
echo >>one &&
|
||||
git add one &&
|
||||
echo b >>one &&
|
||||
cp one expect &&
|
||||
git diff -- one >patch &&
|
||||
echo a >one &&
|
||||
cp one saved-one &&
|
||||
test_must_fail git apply patch &&
|
||||
git apply --whitespace=fix patch &&
|
||||
test_cmp one expect &&
|
||||
mv saved-one one &&
|
||||
git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
'
|
||||
|
||||
test_expect_success 'two missing blank lines at end with --whitespace=fix' '
|
||||
{ echo a; echo; echo b; echo c; } >one &&
|
||||
cp one no-blank-lines &&
|
||||
{ echo; echo; } >>one &&
|
||||
git add one &&
|
||||
echo d >>one &&
|
||||
cp one expect &&
|
||||
echo >>one &&
|
||||
git diff -- one >patch &&
|
||||
cp no-blank-lines one &&
|
||||
test_must_fail git apply patch &&
|
||||
git apply --whitespace=fix patch &&
|
||||
test_cmp one expect &&
|
||||
mv no-blank-lines one &&
|
||||
test_must_fail git apply patch &&
|
||||
git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
'
|
||||
|
||||
test_expect_success 'shrink file with tons of missing blanks at end of file' '
|
||||
{ echo a; echo b; echo c; } >one &&
|
||||
cp one no-blank-lines &&
|
||||
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16; do
|
||||
echo; echo; echo; echo;
|
||||
done >>one &&
|
||||
git add one &&
|
||||
echo a >one &&
|
||||
cp one expect &&
|
||||
git diff -- one >patch &&
|
||||
cp no-blank-lines one &&
|
||||
test_must_fail git apply patch &&
|
||||
git apply --whitespace=fix patch &&
|
||||
test_cmp one expect &&
|
||||
mv no-blank-lines one &&
|
||||
git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
'
|
||||
|
||||
test_expect_success 'missing blanks at EOF must only match blank lines' '
|
||||
{ echo a; echo b; } >one &&
|
||||
git add one &&
|
||||
{ echo c; echo d; } >>one &&
|
||||
git diff -- one >patch &&
|
||||
|
||||
echo a >one &&
|
||||
test_must_fail git apply patch
|
||||
test_must_fail git apply --whitespace=fix patch &&
|
||||
test_must_fail git apply --ignore-space-change --whitespace=fix patch
|
||||
'
|
||||
|
||||
sed -e's/Z//' >one <<EOF
|
||||
a
|
||||
b
|
||||
c
|
||||
Z
|
||||
EOF
|
||||
|
||||
test_expect_success 'missing blank line should match context line with spaces' '
|
||||
git add one &&
|
||||
echo d >>one &&
|
||||
git diff -- one >patch &&
|
||||
{ echo a; echo b; echo c; } >one &&
|
||||
cp one expect &&
|
||||
{ echo; echo d; } >>expect &&
|
||||
git add one &&
|
||||
|
||||
git apply --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
'
|
||||
|
||||
sed -e's/Z//' >one <<EOF
|
||||
a
|
||||
b
|
||||
c
|
||||
Z
|
||||
EOF
|
||||
|
||||
test_expect_success 'same, but with the --ignore-space-option' '
|
||||
git add one &&
|
||||
echo d >>one &&
|
||||
cp one expect &&
|
||||
git diff -- one >patch &&
|
||||
{ echo a; echo b; echo c; } >one &&
|
||||
git add one &&
|
||||
|
||||
git checkout-index -f one &&
|
||||
git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
'
|
||||
|
||||
test_expect_success 'same, but with CR-LF line endings && cr-at-eol set' '
|
||||
git config core.whitespace cr-at-eol &&
|
||||
printf "a\r\n" >one &&
|
||||
printf "b\r\n" >>one &&
|
||||
printf "c\r\n" >>one &&
|
||||
cp one save-one &&
|
||||
printf " \r\n" >>one
|
||||
git add one &&
|
||||
printf "d\r\n" >>one &&
|
||||
cp one expect &&
|
||||
git diff -- one >patch &&
|
||||
mv save-one one &&
|
||||
|
||||
git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
'
|
||||
|
||||
test_expect_success 'same, but with CR-LF line endings && cr-at-eol unset' '
|
||||
git config --unset core.whitespace &&
|
||||
printf "a\r\n" >one &&
|
||||
printf "b\r\n" >>one &&
|
||||
printf "c\r\n" >>one &&
|
||||
cp one save-one &&
|
||||
printf " \r\n" >>one
|
||||
git add one &&
|
||||
cp one expect &&
|
||||
printf "d\r\n" >>one &&
|
||||
git diff -- one >patch &&
|
||||
mv save-one one &&
|
||||
echo d >>expect &&
|
||||
|
||||
git apply --ignore-space-change --whitespace=fix patch &&
|
||||
test_cmp one expect
|
||||
'
|
||||
|
||||
test_done
|
||||
|
||||
Reference in New Issue
Block a user