mirror of
https://github.com/git/git
synced 2024-10-28 19:25:47 +00:00
t5520: remove spaces after redirect operator
The style for tests in Git is to have the redirect operator attached to the filename with no spaces. Fix test cases where this is not the case. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ceeef863de
commit
93a9bf876b
1 changed files with 5 additions and 5 deletions
|
@ -243,10 +243,10 @@ test_expect_success 'fast-forward fails with conflicting work tree' '
|
|||
|
||||
test_expect_success '--rebase' '
|
||||
git branch to-rebase &&
|
||||
echo modified again > file &&
|
||||
echo modified again >file &&
|
||||
git commit -m file file &&
|
||||
git checkout to-rebase &&
|
||||
echo new > file2 &&
|
||||
echo new >file2 &&
|
||||
git add file2 &&
|
||||
git commit -m "new file" &&
|
||||
git tag before-rebase &&
|
||||
|
@ -542,10 +542,10 @@ test_expect_success '--rebase with rebased upstream' '
|
|||
git checkout copy &&
|
||||
git tag copy-orig &&
|
||||
git reset --hard HEAD^ &&
|
||||
echo conflicting modification > file &&
|
||||
echo conflicting modification >file &&
|
||||
git commit -m conflict file &&
|
||||
git checkout to-rebase &&
|
||||
echo file > file2 &&
|
||||
echo file >file2 &&
|
||||
git commit -m to-rebase file2 &&
|
||||
git tag to-rebase-orig &&
|
||||
git pull --rebase me copy &&
|
||||
|
@ -591,7 +591,7 @@ test_expect_success 'pull --rebase dies early with dirty working directory' '
|
|||
test_config branch.to-rebase.remote me &&
|
||||
test_config branch.to-rebase.merge refs/heads/copy &&
|
||||
test_config branch.to-rebase.rebase true &&
|
||||
echo dirty >> file &&
|
||||
echo dirty >>file &&
|
||||
git add file &&
|
||||
test_must_fail git pull &&
|
||||
test "$COPY" = "$(git rev-parse --verify me/copy)" &&
|
||||
|
|
Loading…
Reference in a new issue