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>
Denton Liu committed
Nov 12, 2019 at 15:07 UTC
93a9bf876ba518464b12a5871965dc11df0012e4
1 file changed
+5
-5
t/t5520-pull.sh
+5
-5
@@ -243,10 +243,10 @@ test_expect_success 'fast-forward fails with conflicting work tree' '
243
244
test_expect_success '--rebase' '
245
git branch to-rebase &&
246
- echo modified again > file &&
246
+ echo modified again >file &&
247
git commit -m file file &&
248
git checkout to-rebase &&
249
- echo new > file2 &&
249
+ echo new >file2 &&
250
git add file2 &&
251
git commit -m "new file" &&
252
git tag before-rebase &&
@@ -542,10 +542,10 @@ test_expect_success '--rebase with rebased upstream' '
542
git checkout copy &&
543
git tag copy-orig &&
544
git reset --hard HEAD^ &&
545
- echo conflicting modification > file &&
545
+ echo conflicting modification >file &&
546
git commit -m conflict file &&
547
git checkout to-rebase &&
548
- echo file > file2 &&
548
+ echo file >file2 &&
549
git commit -m to-rebase file2 &&
550
git tag to-rebase-orig &&
551
git pull --rebase me copy &&
@@ -591,7 +591,7 @@ test_expect_success 'pull --rebase dies early with dirty working directory' '
591
test_config branch.to-rebase.remote me &&
592
test_config branch.to-rebase.merge refs/heads/copy &&
593
test_config branch.to-rebase.rebase true &&
594
- echo dirty >> file &&
594
+ echo dirty >>file &&
595
git add file &&
596
test_must_fail git pull &&
597
test "$COPY" = "$(git rev-parse --verify me/copy)" &&