Merge branch 'sg/fsck-config-in-doc'

diff --git a/t/t4046-diff-unmerged.sh b/t/t4046-diff-unmerged.sh
index 25d50a654a8904396cfc0078745dd45034aacce2..ff7cfd884a44ebe0844c7ac6a21f25ed8374e7d4 100755 (executable)
--- a/t/t4046-diff-unmerged.sh
+++ b/t/t4046-diff-unmerged.sh
@@ -8,7 +8,7 @@ test_expect_success setup '
        do
                blob=$(echo $i | git hash-object --stdin) &&
                eval "blob$i=$blob" &&
-               eval "m$i=\"100644 \$blob$i $i\"" || break
+               eval "m$i=\"100644 \$blob$i $i\"" || return 1
        done &&
        paths= &&
        for b in o x
@@ -24,9 +24,9 @@ test_expect_success setup '
                                case "$b" in x) echo "$m1$p" ;; esac &&
                                case "$o" in x) echo "$m2$p" ;; esac &&
                                case "$t" in x) echo "$m3$p" ;; esac ||
-                               break
-                       done || break
-               done || break
+                               return 1
+                       done
+               done
        done >ls-files-s.expect &&
        git update-index --index-info <ls-files-s.expect &&
        git ls-files -s >ls-files-s.actual &&
@@ -37,7 +37,7 @@ test_expect_success 'diff-files -0' '
        for path in $paths
        do
                >"$path" &&
-               echo ":000000 100644 $_z40 $_z40 U      $path"
+               echo ":000000 100644 $ZERO_OID $ZERO_OID U      $path"
        done >diff-files-0.expect &&
        git diff-files -0 >diff-files-0.actual &&
        test_cmp diff-files-0.expect diff-files-0.actual
@@ -47,9 +47,9 @@ test_expect_success 'diff-files -1' '
        for path in $paths
        do
                >"$path" &&
-               echo ":000000 100644 $_z40 $_z40 U      $path" &&
+               echo ":000000 100644 $ZERO_OID $ZERO_OID U      $path" &&
                case "$path" in
-               x??) echo ":100644 100644 $blob1 $_z40 M        $path"
+               x??) echo ":100644 100644 $blob1 $ZERO_OID M    $path"
                esac
        done >diff-files-1.expect &&
        git diff-files -1 >diff-files-1.actual &&
@@ -60,9 +60,9 @@ test_expect_success 'diff-files -2' '
        for path in $paths
        do
                >"$path" &&
-               echo ":000000 100644 $_z40 $_z40 U      $path" &&
+               echo ":000000 100644 $ZERO_OID $ZERO_OID U      $path" &&
                case "$path" in
-               ?x?) echo ":100644 100644 $blob2 $_z40 M        $path"
+               ?x?) echo ":100644 100644 $blob2 $ZERO_OID M    $path"
                esac
        done >diff-files-2.expect &&
        git diff-files -2 >diff-files-2.actual &&
@@ -75,9 +75,9 @@ test_expect_success 'diff-files -3' '
        for path in $paths
        do
                >"$path" &&
-               echo ":000000 100644 $_z40 $_z40 U      $path" &&
+               echo ":000000 100644 $ZERO_OID $ZERO_OID U      $path" &&
                case "$path" in
-               ??x) echo ":100644 100644 $blob3 $_z40 M        $path"
+               ??x) echo ":100644 100644 $blob3 $ZERO_OID M    $path"
                esac
        done >diff-files-3.expect &&
        git diff-files -3 >diff-files-3.actual &&