t3507: clean up style

Remove space after redirection operators for style. Also, remove a git
command which was upstream of a pipe. Finally, let grep and sed open
their own input instead of letting the shell redirect the input.

Helped-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t3507-cherry-pick-conflict.sh b/t/t3507-cherry-pick-conflict.sh
index 0db166152ab9eafee7a34421c1100029bda485eb..777fb23d187d6030f94a862d24d24e47eb011ebc 100755 (executable)
--- a/t/t3507-cherry-pick-conflict.sh
+++ b/t/t3507-cherry-pick-conflict.sh
@@ -88,7 +88,7 @@ test_expect_success 'cherry-pick --no-commit does not set CHERRY_PICK_HEAD' '
 
 test_expect_success 'cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD' '
        pristine_detach initial &&
 
 test_expect_success 'cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD' '
        pristine_detach initial &&

-       echo foo > foo &&
+       echo foo >foo &&

        test_must_fail git cherry-pick base &&
        test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 '
        test_must_fail git cherry-pick base &&
        test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 '


@@ -96,7 +96,7 @@ test_expect_success 'cherry-pick w/dirty tree does not set CHERRY_PICK_HEAD' '
 test_expect_success \
        'cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD' '
        pristine_detach initial &&
 test_expect_success \
        'cherry-pick --strategy=resolve w/dirty tree does not set CHERRY_PICK_HEAD' '
        pristine_detach initial &&

-       echo foo > foo &&
+       echo foo >foo &&

        test_must_fail git cherry-pick --strategy=resolve base &&
        test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 '
        test_must_fail git cherry-pick --strategy=resolve base &&
        test_must_fail git rev-parse --verify CHERRY_PICK_HEAD
 '


@@ -175,23 +175,23 @@ test_expect_success 'failed cherry-pick registers participants in index' '
                git ls-files --stage foo &&
                git checkout picked -- foo &&
                git ls-files --stage foo
                git ls-files --stage foo &&
                git checkout picked -- foo &&
                git ls-files --stage foo

-       } > stages &&
+       } >stages &&

        sed "
                1 s/ 0  / 1     /
                2 s/ 0  / 2     /
                3 s/ 0  / 3     /
        sed "
                1 s/ 0  / 1     /
                2 s/ 0  / 2     /
                3 s/ 0  / 3     /

-       " < stages > expected &&
+       " stages >expected &&

        git read-tree -u --reset HEAD &&
 
        test_must_fail git cherry-pick picked &&
        git read-tree -u --reset HEAD &&
 
        test_must_fail git cherry-pick picked &&

-       git ls-files --stage --unmerged > actual &&
+       git ls-files --stage --unmerged >actual &&

 
        test_cmp expected actual
 '
 
 test_expect_success 'failed cherry-pick describes conflict in work tree' '
        pristine_detach initial &&
 
        test_cmp expected actual
 '
 
 test_expect_success 'failed cherry-pick describes conflict in work tree' '
        pristine_detach initial &&

-       cat <<-EOF > expected &&
+       cat <<-EOF >expected &&

        <<<<<<< HEAD
        a
        =======
        <<<<<<< HEAD
        a
        =======


@@ -201,14 +201,14 @@ test_expect_success 'failed cherry-pick describes conflict in work tree' '
 
        test_must_fail git cherry-pick picked &&
 
 
        test_must_fail git cherry-pick picked &&
 

-       sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
+       sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&

        test_cmp expected actual
 '
 
 test_expect_success 'diff3 -m style' '
        pristine_detach initial &&
        git config merge.conflictstyle diff3 &&
        test_cmp expected actual
 '
 
 test_expect_success 'diff3 -m style' '
        pristine_detach initial &&
        git config merge.conflictstyle diff3 &&

-       cat <<-EOF > expected &&
+       cat <<-EOF >expected &&

        <<<<<<< HEAD
        a
        ||||||| parent of objid picked
        <<<<<<< HEAD
        a
        ||||||| parent of objid picked


@@ -220,14 +220,14 @@ test_expect_success 'diff3 -m style' '
 
        test_must_fail git cherry-pick picked &&
 
 
        test_must_fail git cherry-pick picked &&
 

-       sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
+       sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&

        test_cmp expected actual
 '
 
 test_expect_success 'revert also handles conflicts sanely' '
        git config --unset merge.conflictstyle &&
        pristine_detach initial &&
        test_cmp expected actual
 '
 
 test_expect_success 'revert also handles conflicts sanely' '
        git config --unset merge.conflictstyle &&
        pristine_detach initial &&

-       cat <<-EOF > expected &&
+       cat <<-EOF >expected &&

        <<<<<<< HEAD
        a
        =======
        <<<<<<< HEAD
        a
        =======


@@ -241,24 +241,24 @@ test_expect_success 'revert also handles conflicts sanely' '
                git ls-files --stage foo &&
                git checkout base -- foo &&
                git ls-files --stage foo
                git ls-files --stage foo &&
                git checkout base -- foo &&
                git ls-files --stage foo

-       } > stages &&
+       } >stages &&

        sed "
                1 s/ 0  / 1     /
                2 s/ 0  / 2     /
                3 s/ 0  / 3     /
        sed "
                1 s/ 0  / 1     /
                2 s/ 0  / 2     /
                3 s/ 0  / 3     /

-       " < stages > expected-stages &&
+       " stages >expected-stages &&

        git read-tree -u --reset HEAD &&
 
        head=$(git rev-parse HEAD) &&
        test_must_fail git revert picked &&
        newhead=$(git rev-parse HEAD) &&
        git read-tree -u --reset HEAD &&
 
        head=$(git rev-parse HEAD) &&
        test_must_fail git revert picked &&
        newhead=$(git rev-parse HEAD) &&

-       git ls-files --stage --unmerged > actual-stages &&
+       git ls-files --stage --unmerged >actual-stages &&

 
        test "$head" = "$newhead" &&
        test_must_fail git update-index --refresh -q &&
        test_must_fail git diff-index --exit-code HEAD &&
        test_cmp expected-stages actual-stages &&
 
        test "$head" = "$newhead" &&
        test_must_fail git update-index --refresh -q &&
        test_must_fail git diff-index --exit-code HEAD &&
        test_cmp expected-stages actual-stages &&

-       sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
+       sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&

        test_cmp expected actual
 '
 
        test_cmp expected actual
 '
 


@@ -284,7 +284,7 @@ test_expect_success 'revert --no-commit sets REVERT_HEAD' '
 
 test_expect_success 'revert w/dirty tree does not set REVERT_HEAD' '
        pristine_detach base &&
 
 test_expect_success 'revert w/dirty tree does not set REVERT_HEAD' '
        pristine_detach base &&

-       echo foo > foo &&
+       echo foo >foo &&

        test_must_fail git revert base &&
        test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
        test_must_fail git rev-parse --verify REVERT_HEAD
        test_must_fail git revert base &&
        test_must_fail git rev-parse --verify CHERRY_PICK_HEAD &&
        test_must_fail git rev-parse --verify REVERT_HEAD


@@ -319,7 +319,7 @@ test_expect_success 'failed commit does not clear REVERT_HEAD' '
 test_expect_success 'revert conflict, diff3 -m style' '
        pristine_detach initial &&
        git config merge.conflictstyle diff3 &&
 test_expect_success 'revert conflict, diff3 -m style' '
        pristine_detach initial &&
        git config merge.conflictstyle diff3 &&

-       cat <<-EOF > expected &&
+       cat <<-EOF >expected &&

        <<<<<<< HEAD
        a
        ||||||| objid picked
        <<<<<<< HEAD
        a
        ||||||| objid picked


@@ -331,7 +331,7 @@ test_expect_success 'revert conflict, diff3 -m style' '
 
        test_must_fail git revert picked &&
 
 
        test_must_fail git revert picked &&
 

-       sed "s/[a-f0-9]*\.\.\./objid/" foo > actual &&
+       sed "s/[a-f0-9]*\.\.\./objid/" foo >actual &&

        test_cmp expected actual
 '
 
        test_cmp expected actual
 '
 


@@ -345,7 +345,7 @@ test_expect_success 'commit after failed cherry-pick does not add duplicated -s'
        pristine_detach initial &&
        test_must_fail git cherry-pick -s picked-signed &&
        git commit -a -s &&
        pristine_detach initial &&
        test_must_fail git cherry-pick -s picked-signed &&
        git commit -a -s &&

-       test $(git show -s |grep -c "Signed-off-by") = 1
+       test $(git show -s >tmp && grep -c "Signed-off-by" tmp && rm tmp) = 1

 '
 
 test_expect_success 'commit after failed cherry-pick adds -s at the right place' '
 '
 
 test_expect_success 'commit after failed cherry-pick adds -s at the right place' '


@@ -359,7 +359,7 @@ test_expect_success 'commit after failed cherry-pick adds -s at the right place'
        Signed-off-by: C O Mitter <committer@example.com>
        # Conflicts:
        EOF
        Signed-off-by: C O Mitter <committer@example.com>
        # Conflicts:
        EOF

-       grep -e "^# Conflicts:" -e '^Signed-off-by' <.git/COMMIT_EDITMSG >actual &&
+       grep -e "^# Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual &&

        test_cmp expect actual &&
 
        cat <<-\EOF >expected &&
        test_cmp expect actual &&
 
        cat <<-\EOF >expected &&


@@ -378,7 +378,7 @@ test_expect_success 'commit --amend -s places the sign-off at the right place' '
 
        # emulate old-style conflicts block
        mv .git/MERGE_MSG .git/MERGE_MSG+ &&
 
        # emulate old-style conflicts block
        mv .git/MERGE_MSG .git/MERGE_MSG+ &&

-       sed -e "/^# Conflicts:/,\$s/^# *//" <.git/MERGE_MSG+ >.git/MERGE_MSG &&
+       sed -e "/^# Conflicts:/,\$s/^# *//" .git/MERGE_MSG+ >.git/MERGE_MSG &&

 
        git commit -a &&
        git commit --amend -s &&
 
        git commit -a &&
        git commit --amend -s &&


@@ -388,7 +388,7 @@ test_expect_success 'commit --amend -s places the sign-off at the right place' '
        Signed-off-by: C O Mitter <committer@example.com>
        Conflicts:
        EOF
        Signed-off-by: C O Mitter <committer@example.com>
        Conflicts:
        EOF

-       grep -e "^Conflicts:" -e '^Signed-off-by' <.git/COMMIT_EDITMSG >actual &&
+       grep -e "^Conflicts:" -e '^Signed-off-by' .git/COMMIT_EDITMSG >actual &&

        test_cmp expect actual
 '
 
        test_cmp expect actual
 '