t3400 (rebase): whitespace cleanup

This test used 5-space indents since it was added in 2005, but
recently the temptation to use tabs to indent has been too
strong, resulting in uneven whitespace.  Switch over completely
to tabs.

While at it, use a more modern style for consistency with other
tests:

 - names of tests go on the same line as test_expect_success;
 - extra whitespace after > redirection operators is removed.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-07-23 12:05:24 -05:00 committed by Junio C Hamano
parent 18cdf802ca
commit e877a4c11a

View File

@ -14,26 +14,25 @@ GIT_AUTHOR_NAME=author@name
GIT_AUTHOR_EMAIL=bogus@email@address GIT_AUTHOR_EMAIL=bogus@email@address
export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL
test_expect_success \ test_expect_success 'prepare repository with topic branches' '
'prepare repository with topic branches' \ git config core.logAllRefUpdates true &&
'git config core.logAllRefUpdates true && echo First >A &&
echo First > A &&
git update-index --add A && git update-index --add A &&
git commit -m "Add A." && git commit -m "Add A." &&
git checkout -b my-topic-branch && git checkout -b my-topic-branch &&
echo Second > B && echo Second >B &&
git update-index --add B && git update-index --add B &&
git commit -m "Add B." && git commit -m "Add B." &&
git checkout -f master && git checkout -f master &&
echo Third >> A && echo Third >>A &&
git update-index A && git update-index A &&
git commit -m "Modify A." && git commit -m "Modify A." &&
git checkout -b side my-topic-branch && git checkout -b side my-topic-branch &&
echo Side >> C && echo Side >>C &&
git add C && git add C &&
git commit -m "Add C" && git commit -m "Add C" &&
git checkout -b nonlinear my-topic-branch && git checkout -b nonlinear my-topic-branch &&
echo Edit >> B && echo Edit >>B &&
git add B && git add B &&
git commit -m "Modify B" && git commit -m "Modify B" &&
git merge side && git merge side &&
@ -44,16 +43,19 @@ test_expect_success \
' '
test_expect_success 'rebase on dirty worktree' ' test_expect_success 'rebase on dirty worktree' '
echo dirty >> A && echo dirty >>A &&
test_must_fail git rebase master' test_must_fail git rebase master
'
test_expect_success 'rebase on dirty cache' ' test_expect_success 'rebase on dirty cache' '
git add A && git add A &&
test_must_fail git rebase master' test_must_fail git rebase master
'
test_expect_success 'rebase against master' ' test_expect_success 'rebase against master' '
git reset --hard HEAD && git reset --hard HEAD &&
git rebase master' git rebase master
'
test_expect_success 'rebase against master twice' ' test_expect_success 'rebase against master twice' '
git rebase master >out && git rebase master >out &&
@ -77,13 +79,14 @@ test_expect_success 'rebase fast-forward to master' '
grep "Fast-forwarded HEAD to my-topic-branch" out grep "Fast-forwarded HEAD to my-topic-branch" out
' '
test_expect_success \ test_expect_success 'the rebase operation should not have destroyed author information' '
'the rebase operation should not have destroyed author information' \ ! (git log | grep "Author:" | grep "<>")
'! (git log | grep "Author:" | grep "<>")' '
test_expect_success \ test_expect_success 'the rebase operation should not have destroyed author information (2)' "
'the rebase operation should not have destroyed author information (2)' \ git log -1 |
"git log -1 | grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'" grep 'Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>'
"
test_expect_success 'HEAD was detached during rebase' ' test_expect_success 'HEAD was detached during rebase' '
test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1}) test $(git rev-parse HEAD@{1}) != $(git rev-parse my-topic-branch@{1})
@ -103,8 +106,7 @@ test_expect_success 'rebase of history with merges is linearized' '
test 3 = $(git rev-list master.. | wc -l) test 3 = $(git rev-list master.. | wc -l)
' '
test_expect_success \ test_expect_success 'rebase of history with merges after upstream merge is linearized' '
'rebase of history with merges after upstream merge is linearized' '
git checkout upstream-merged-nonlinear && git checkout upstream-merged-nonlinear &&
test 5 = $(git rev-list master.. | wc -l) && test 5 = $(git rev-list master.. | wc -l) &&
git rebase master && git rebase master &&
@ -113,12 +115,12 @@ test_expect_success \
test_expect_success 'rebase a single mode change' ' test_expect_success 'rebase a single mode change' '
git checkout master && git checkout master &&
echo 1 > X && echo 1 >X &&
git add X && git add X &&
test_tick && test_tick &&
git commit -m prepare && git commit -m prepare &&
git checkout -b modechange HEAD^ && git checkout -b modechange HEAD^ &&
echo 1 > X && echo 1 >X &&
git add X && git add X &&
test_chmod +x A && test_chmod +x A &&
test_tick && test_tick &&
@ -127,8 +129,8 @@ test_expect_success 'rebase a single mode change' '
' '
test_expect_success 'Show verbose error when HEAD could not be detached' ' test_expect_success 'Show verbose error when HEAD could not be detached' '
: > B && >B &&
test_must_fail git rebase topic 2> output.err > output.out && test_must_fail git rebase topic 2>output.err >output.out &&
grep "Untracked working tree file .B. would be overwritten" output.err grep "Untracked working tree file .B. would be overwritten" output.err
' '
rm -f B rm -f B
@ -146,7 +148,7 @@ test_expect_success 'dump usage when upstream arg is missing' '
test_expect_success 'rebase -q is quiet' ' test_expect_success 'rebase -q is quiet' '
git checkout -b quiet topic && git checkout -b quiet topic &&
git rebase -q master > output.out 2>&1 && git rebase -q master >output.out 2>&1 &&
test ! -s output.out test ! -s output.out
' '