Use reflog in 'pull --rebase . foo'

diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
index a7e24edf5b0ac3157ab2772f3cd94db176e810c1..ebbc7554a7d4dce4c2ed33a79f5d4feb3a520f05 100755 (executable)
--- a/t/t0003-attributes.sh
+++ b/t/t0003-attributes.sh
@@ -38,7 +38,7 @@ test_expect_success 'setup' '
        ) >a/b/.gitattributes
        (
                echo "global test=global"
-       ) >$HOME/global-gitattributes
+       ) >"$HOME"/global-gitattributes
 
 '
 
@@ -51,11 +51,11 @@ test_expect_success 'attribute test' '
        attr_check a/b/g a/b/g &&
        attr_check b/g unspecified &&
        attr_check a/b/h a/b/h &&
-       attr_check a/b/d/g "a/b/d/*"
-       attr_check onoff unset
-       attr_check offon set
-       attr_check no unspecified
-       attr_check a/b/d/no "a/b/d/*"
+       attr_check a/b/d/g "a/b/d/*" &&
+       attr_check onoff unset &&
+       attr_check offon set &&
+       attr_check no unspecified &&
+       attr_check a/b/d/no "a/b/d/*" &&
        attr_check a/b/d/yes unspecified
 
 '
@@ -72,7 +72,7 @@ test_expect_success 'core.attributesfile' '
 
 test_expect_success 'attribute test: read paths from stdin' '
 
-       cat <<EOF > expect
+       cat <<EOF > expect &&
 f: test: f
 a/f: test: f
 a/c/f: test: f