t7110-reset-merge: modernize test format

Some tests still use the old format with four spaces indentation.
Standardize the tests to the new format with tab indentation.

Signed-off-by: John Cai <johncai86@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7110-reset-merge.sh b/t/t7110-reset-merge.sh
index eb881be95b615f53867dbe8f56c6b0f9cc7a9d3c..772480a345ffa0703432e070e5e85ec56a322c00 100755 (executable)
--- a/t/t7110-reset-merge.sh
+++ b/t/t7110-reset-merge.sh
@@ -9,17 +9,17 @@ TEST_PASSES_SANITIZE_LEAK=true
 . ./test-lib.sh
 
 test_expect_success setup '
-    printf "line %d\n" 1 2 3 >file1 &&
-    cat file1 >file2 &&
-    git add file1 file2 &&
-    test_tick &&
-    git commit -m "Initial commit" &&
-    git tag initial &&
-    echo line 4 >>file1 &&
-    cat file1 >file2 &&
-    test_tick &&
-    git commit -m "add line 4 to file1" file1 &&
-    git tag second
+       printf "line %d\n" 1 2 3 >file1 &&
+       cat file1 >file2 &&
+       git add file1 file2 &&
+       test_tick &&
+       git commit -m "Initial commit" &&
+       git tag initial &&
+       echo line 4 >>file1 &&
+       cat file1 >file2 &&
+       test_tick &&
+       git commit -m "add line 4 to file1" file1 &&
+       git tag second
 '
 
 # The next test will test the following:
@@ -29,19 +29,19 @@ test_expect_success setup '
 # file1:     C       C     C    D     --merge  D       D     D
 # file2:     C       D     D    D     --merge  C       D     D
 test_expect_success 'reset --merge is ok with changes in file it does not touch' '
-    git reset --merge HEAD^ &&
-    ! grep 4 file1 &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-    test -z "$(git diff --cached)"
+       git reset --merge HEAD^ &&
+       ! grep 4 file1 &&
+       grep 4 file2 &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+       test -z "$(git diff --cached)"
 '
 
 test_expect_success 'reset --merge is ok when switching back' '
-    git reset --merge second &&
-    grep 4 file1 &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)"
+       git reset --merge second &&
+       grep 4 file1 &&
+       grep 4 file2 &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+       test -z "$(git diff --cached)"
 '
 
 # The next test will test the following:
@@ -51,21 +51,21 @@ test_expect_success 'reset --merge is ok when switching back' '
 # file1:     C       C     C    D     --keep   D       D     D
 # file2:     C       D     D    D     --keep   C       D     D
 test_expect_success 'reset --keep is ok with changes in file it does not touch' '
-    git reset --hard second &&
-    cat file1 >file2 &&
-    git reset --keep HEAD^ &&
-    ! grep 4 file1 &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-    test -z "$(git diff --cached)"
+       git reset --hard second &&
+       cat file1 >file2 &&
+       git reset --keep HEAD^ &&
+       ! grep 4 file1 &&
+       grep 4 file2 &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+       test -z "$(git diff --cached)"
 '
 
 test_expect_success 'reset --keep is ok when switching back' '
-    git reset --keep second &&
-    grep 4 file1 &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)"
+       git reset --keep second &&
+       grep 4 file1 &&
+       grep 4 file2 &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+       test -z "$(git diff --cached)"
 '
 
 # The next test will test the following:
@@ -75,28 +75,28 @@ test_expect_success 'reset --keep is ok when switching back' '
 # file1:     B       B     C    D     --merge  D       D     D
 # file2:     C       D     D    D     --merge  C       D     D
 test_expect_success 'reset --merge discards changes added to index (1)' '
-    git reset --hard second &&
-    cat file1 >file2 &&
-    echo "line 5" >> file1 &&
-    git add file1 &&
-    git reset --merge HEAD^ &&
-    ! grep 4 file1 &&
-    ! grep 5 file1 &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-    test -z "$(git diff --cached)"
+       git reset --hard second &&
+       cat file1 >file2 &&
+       echo "line 5" >> file1 &&
+       git add file1 &&
+       git reset --merge HEAD^ &&
+       ! grep 4 file1 &&
+       ! grep 5 file1 &&
+       grep 4 file2 &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+       test -z "$(git diff --cached)"
 '
 
 test_expect_success 'reset --merge is ok again when switching back (1)' '
-    git reset --hard initial &&
-    echo "line 5" >> file2 &&
-    git add file2 &&
-    git reset --merge second &&
-    ! grep 4 file2 &&
-    ! grep 5 file1 &&
-    grep 4 file1 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)"
+       git reset --hard initial &&
+       echo "line 5" >> file2 &&
+       git add file2 &&
+       git reset --merge second &&
+       ! grep 4 file2 &&
+       ! grep 5 file1 &&
+       grep 4 file1 &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+       test -z "$(git diff --cached)"
 '
 
 # The next test will test the following:
@@ -105,10 +105,10 @@ test_expect_success 'reset --merge is ok again when switching back (1)' '
 #           ----------------------------------------------------
 # file1:     B       B     C    D     --keep   (disallowed)
 test_expect_success 'reset --keep fails with changes in index in files it touches' '
-    git reset --hard second &&
-    echo "line 5" >> file1 &&
-    git add file1 &&
-    test_must_fail git reset --keep HEAD^
+       git reset --hard second &&
+       echo "line 5" >> file1 &&
+       git add file1 &&
+       test_must_fail git reset --keep HEAD^
 '
 
 # The next test will test the following:
@@ -118,23 +118,23 @@ test_expect_success 'reset --keep fails with changes in index in files it touche
 # file1:     C       C     C    D     --merge  D       D     D
 # file2:     C       C     D    D     --merge  D       D     D
 test_expect_success 'reset --merge discards changes added to index (2)' '
-    git reset --hard second &&
-    echo "line 4" >> file2 &&
-    git add file2 &&
-    git reset --merge HEAD^ &&
-    ! grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-    test -z "$(git diff)" &&
-    test -z "$(git diff --cached)"
+       git reset --hard second &&
+       echo "line 4" >> file2 &&
+       git add file2 &&
+       git reset --merge HEAD^ &&
+       ! grep 4 file2 &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+       test -z "$(git diff)" &&
+       test -z "$(git diff --cached)"
 '
 
 test_expect_success 'reset --merge is ok again when switching back (2)' '
-    git reset --hard initial &&
-    git reset --merge second &&
-    ! grep 4 file2 &&
-    grep 4 file1 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)"
+       git reset --hard initial &&
+       git reset --merge second &&
+       ! grep 4 file2 &&
+       grep 4 file1 &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+       test -z "$(git diff --cached)"
 '
 
 # The next test will test the following:
@@ -144,21 +144,21 @@ test_expect_success 'reset --merge is ok again when switching back (2)' '
 # file1:     C       C     C    D     --keep   D       D     D
 # file2:     C       C     D    D     --keep   C       D     D
 test_expect_success 'reset --keep keeps changes it does not touch' '
-    git reset --hard second &&
-    echo "line 4" >> file2 &&
-    git add file2 &&
-    git reset --keep HEAD^ &&
-    grep 4 file2 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
-    test -z "$(git diff --cached)"
+       git reset --hard second &&
+       echo "line 4" >> file2 &&
+       git add file2 &&
+       git reset --keep HEAD^ &&
+       grep 4 file2 &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse initial)" &&
+       test -z "$(git diff --cached)"
 '
 
 test_expect_success 'reset --keep keeps changes when switching back' '
-    git reset --keep second &&
-    grep 4 file2 &&
-    grep 4 file1 &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)"
+       git reset --keep second &&
+       grep 4 file2 &&
+       grep 4 file1 &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+       test -z "$(git diff --cached)"
 '
 
 # The next test will test the following:
@@ -167,14 +167,14 @@ test_expect_success 'reset --keep keeps changes when switching back' '
 #           ----------------------------------------------------
 # file1:     A       B     B    C     --merge  (disallowed)
 test_expect_success 'reset --merge fails with changes in file it touches' '
-    git reset --hard second &&
-    echo "line 5" >> file1 &&
-    test_tick &&
-    git commit -m "add line 5" file1 &&
-    sed -e "s/line 1/changed line 1/" <file1 >file3 &&
-    mv file3 file1 &&
-    test_must_fail git reset --merge HEAD^ 2>err.log &&
-    grep file1 err.log | grep "not uptodate"
+       git reset --hard second &&
+       echo "line 5" >> file1 &&
+       test_tick &&
+       git commit -m "add line 5" file1 &&
+       sed -e "s/line 1/changed line 1/" <file1 >file3 &&
+       mv file3 file1 &&
+       test_must_fail git reset --merge HEAD^ 2>err.log &&
+       grep file1 err.log | grep "not uptodate"
 '
 
 # The next test will test the following:
@@ -183,36 +183,36 @@ test_expect_success 'reset --merge fails with changes in file it touches' '
 #           ----------------------------------------------------
 # file1:     A       B     B    C     --keep   (disallowed)
 test_expect_success 'reset --keep fails with changes in file it touches' '
-    git reset --hard second &&
-    echo "line 5" >> file1 &&
-    test_tick &&
-    git commit -m "add line 5" file1 &&
-    sed -e "s/line 1/changed line 1/" <file1 >file3 &&
-    mv file3 file1 &&
-    test_must_fail git reset --keep HEAD^ 2>err.log &&
-    grep file1 err.log | grep "not uptodate"
+       git reset --hard second &&
+       echo "line 5" >> file1 &&
+       test_tick &&
+       git commit -m "add line 5" file1 &&
+       sed -e "s/line 1/changed line 1/" <file1 >file3 &&
+       mv file3 file1 &&
+       test_must_fail git reset --keep HEAD^ 2>err.log &&
+       grep file1 err.log | grep "not uptodate"
 '
 
 test_expect_success 'setup 3 different branches' '
-    git reset --hard second &&
-    git branch branch1 &&
-    git branch branch2 &&
-    git branch branch3 &&
-    git checkout branch1 &&
-    echo "line 5 in branch1" >> file1 &&
-    test_tick &&
-    git commit -a -m "change in branch1" &&
-    git checkout branch2 &&
-    echo "line 5 in branch2" >> file1 &&
-    test_tick &&
-    git commit -a -m "change in branch2" &&
-    git tag third &&
-    git checkout branch3 &&
-    echo a new file >file3 &&
-    rm -f file1 &&
-    git add file3 &&
-    test_tick &&
-    git commit -a -m "change in branch3"
+       git reset --hard second &&
+       git branch branch1 &&
+       git branch branch2 &&
+       git branch branch3 &&
+       git checkout branch1 &&
+       echo "line 5 in branch1" >> file1 &&
+       test_tick &&
+       git commit -a -m "change in branch1" &&
+       git checkout branch2 &&
+       echo "line 5 in branch2" >> file1 &&
+       test_tick &&
+       git commit -a -m "change in branch2" &&
+       git tag third &&
+       git checkout branch3 &&
+       echo a new file >file3 &&
+       rm -f file1 &&
+       git add file3 &&
+       test_tick &&
+       git commit -a -m "change in branch3"
 '
 
 # The next test will test the following:
@@ -221,12 +221,12 @@ test_expect_success 'setup 3 different branches' '
 #           ----------------------------------------------------
 # file1:     X       U     B    C     --merge  C       C     C
 test_expect_success '"reset --merge HEAD^" is ok with pending merge' '
-    git checkout third &&
-    test_must_fail git merge branch1 &&
-    git reset --merge HEAD^ &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
-    test -z "$(git diff --cached)" &&
-    test -z "$(git diff)"
+       git checkout third &&
+       test_must_fail git merge branch1 &&
+       git reset --merge HEAD^ &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse second)" &&
+       test -z "$(git diff --cached)" &&
+       test -z "$(git diff)"
 '
 
 # The next test will test the following:
@@ -235,10 +235,10 @@ test_expect_success '"reset --merge HEAD^" is ok with pending merge' '
 #           ----------------------------------------------------
 # file1:     X       U     B    C     --keep   (disallowed)
 test_expect_success '"reset --keep HEAD^" fails with pending merge' '
-    git reset --hard third &&
-    test_must_fail git merge branch1 &&
-    test_must_fail git reset --keep HEAD^ 2>err.log &&
-    test_i18ngrep "middle of a merge" err.log
+       git reset --hard third &&
+       test_must_fail git merge branch1 &&
+       test_must_fail git reset --keep HEAD^ 2>err.log &&
+       test_i18ngrep "middle of a merge" err.log
 '
 
 # The next test will test the following:
@@ -247,12 +247,12 @@ test_expect_success '"reset --keep HEAD^" fails with pending merge' '
 #           ----------------------------------------------------
 # file1:     X       U     B    B     --merge  B       B     B
 test_expect_success '"reset --merge HEAD" is ok with pending merge' '
-    git reset --hard third &&
-    test_must_fail git merge branch1 &&
-    git reset --merge HEAD &&
-    test "$(git rev-parse HEAD)" = "$(git rev-parse third)" &&
-    test -z "$(git diff --cached)" &&
-    test -z "$(git diff)"
+       git reset --hard third &&
+       test_must_fail git merge branch1 &&
+       git reset --merge HEAD &&
+       test "$(git rev-parse HEAD)" = "$(git rev-parse third)" &&
+       test -z "$(git diff --cached)" &&
+       test -z "$(git diff)"
 '
 
 # The next test will test the following:
@@ -261,36 +261,36 @@ test_expect_success '"reset --merge HEAD" is ok with pending merge' '
 #           ----------------------------------------------------
 # file1:     X       U     B    B     --keep   (disallowed)
 test_expect_success '"reset --keep HEAD" fails with pending merge' '
-    git reset --hard third &&
-    test_must_fail git merge branch1 &&
-    test_must_fail git reset --keep HEAD 2>err.log &&
-    test_i18ngrep "middle of a merge" err.log
+       git reset --hard third &&
+       test_must_fail git merge branch1 &&
+       test_must_fail git reset --keep HEAD 2>err.log &&
+       test_i18ngrep "middle of a merge" err.log
 '
 
 test_expect_success '--merge is ok with added/deleted merge' '
-    git reset --hard third &&
-    rm -f file2 &&
-    test_must_fail git merge branch3 &&
-    ! test -f file2 &&
-    test -f file3 &&
-    git diff --exit-code file3 &&
-    git diff --exit-code branch3 file3 &&
-    git reset --merge HEAD &&
-    ! test -f file3 &&
-    ! test -f file2 &&
-    git diff --exit-code --cached
+       git reset --hard third &&
+       rm -f file2 &&
+       test_must_fail git merge branch3 &&
+       ! test -f file2 &&
+       test -f file3 &&
+       git diff --exit-code file3 &&
+       git diff --exit-code branch3 file3 &&
+       git reset --merge HEAD &&
+       ! test -f file3 &&
+       ! test -f file2 &&
+       git diff --exit-code --cached
 '
 
 test_expect_success '--keep fails with added/deleted merge' '
-    git reset --hard third &&
-    rm -f file2 &&
-    test_must_fail git merge branch3 &&
-    ! test -f file2 &&
-    test -f file3 &&
-    git diff --exit-code file3 &&
-    git diff --exit-code branch3 file3 &&
-    test_must_fail git reset --keep HEAD 2>err.log &&
-    test_i18ngrep "middle of a merge" err.log
+       git reset --hard third &&
+       rm -f file2 &&
+       test_must_fail git merge branch3 &&
+       ! test -f file2 &&
+       test -f file3 &&
+       git diff --exit-code file3 &&
+       git diff --exit-code branch3 file3 &&
+       test_must_fail git reset --keep HEAD 2>err.log &&
+       test_i18ngrep "middle of a merge" err.log
 '
 
 test_done