Merge branch 'as/test-cleanup'

* as/test-cleanup:
t7102 (reset): don't hardcode SHA-1 in expected outputs

diff --combined t/t7102-reset.sh
index 1fa2a5fc23da25643552cdf43408cb75480194ff,cf492f48331c523cd08d4d9917e1f84af092530c..df82ec9ddae30acc5cad23886cbf6ff2de287e7f
--- 1/t/t7102-reset.sh
--- 2/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@@ -28,7 -28,8 +28,8 @@@ test_expect_success 'creating initial f
  
        echo "1st line 2nd file" >secondfile &&
        echo "2nd line 2nd file" >>secondfile &&
-       git commit -a -m "modify 2nd file"
+       git commit -a -m "modify 2nd file" &&
+       head5=$(git rev-parse --verify HEAD)
  '
  # git log --pretty=oneline # to see those SHA1 involved
  
@@@ -56,7 -57,7 +57,7 @@@ test_expect_success 'giving a non exist
        test_must_fail git reset --mixed aaaaaa &&
        test_must_fail git reset --soft aaaaaa &&
        test_must_fail git reset --hard aaaaaa &&
-       check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
+       check_changes $head5
  '
  
  test_expect_success 'reset --soft with unmerged index should fail' '
@@@ -74,7 -75,7 +75,7 @@@ test_expect_success 
        test_must_fail git reset --hard -- first &&
        test_must_fail git reset --soft HEAD^ -- first &&
        test_must_fail git reset --hard HEAD^ -- first &&
-       check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
+       check_changes $head5
  '
  
  test_expect_success 'giving unrecognized options should fail' '
@@@ -86,7 -87,7 +87,7 @@@
        test_must_fail git reset --soft -o &&
        test_must_fail git reset --hard --other &&
        test_must_fail git reset --hard -o &&
-       check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
+       check_changes $head5
  '
  
  test_expect_success \
@@@ -110,7 -111,7 +111,7 @@@
  
        git checkout master &&
        git branch -D branch1 branch2 &&
-       check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
+       check_changes $head5
  '
  
  test_expect_success \
@@@ -133,27 -134,27 +134,27 @@@
  
        git checkout master &&
        git branch -D branch3 branch4 &&
-       check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
+       check_changes $head5
  '
  
  test_expect_success \
        'resetting to HEAD with no changes should succeed and do nothing' '
        git reset --hard &&
-               check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
+               check_changes $head5 &&
        git reset --hard HEAD &&
-               check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
+               check_changes $head5 &&
        git reset --soft &&
-               check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
+               check_changes $head5 &&
        git reset --soft HEAD &&
-               check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
+               check_changes $head5 &&
        git reset --mixed &&
-               check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
+               check_changes $head5 &&
        git reset --mixed HEAD &&
-               check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
+               check_changes $head5 &&
        git reset &&
-               check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
+               check_changes $head5 &&
        git reset HEAD &&
-               check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
+               check_changes $head5
  '
  
  >.diff_expect
@@@ -176,7 -177,7 +177,7 @@@ test_expect_success '--soft reset only 
        git reset --soft HEAD^ &&
        check_changes d1a4bc3abce4829628ae2dcb0d60ef3d1a78b1c4 &&
        test "$(git rev-parse ORIG_HEAD)" = \
-                       3ec39651e7f44ea531a5de18a9fa791c0fd370fc
+                       $head5
  '
  
  >.diff_expect
@@@ -193,7 -194,7 +194,7 @@@ test_expect_success 
        git commit -a -C ORIG_HEAD &&
        check_changes 3d3b7be011a58ca0c179ae45d94e6c83c0b0cd0d &&
        test "$(git rev-parse ORIG_HEAD)" = \
-                       3ec39651e7f44ea531a5de18a9fa791c0fd370fc
+                       $head5
  '
  
  >.diff_expect
@@@ -303,7 -304,7 +304,7 @@@ test_expect_success 'redoing the last t
        echo "1st line 2nd file" >secondfile &&
        echo "2nd line 2nd file" >>secondfile &&
        git commit -a -m "modify 2nd file" &&
-       check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
+       check_changes $head5
  '
  
  >.diff_expect
@@@ -341,15 -342,15 +342,15 @@@ EO
  test_expect_success \
        '--hard reset to ORIG_HEAD should clear a fast-forward merge' '
        git reset --hard HEAD^ &&
-       check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
+       check_changes $head5 &&
  
        git pull . branch1 &&
        git reset --hard ORIG_HEAD &&
-       check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc &&
+       check_changes $head5 &&
  
        git checkout master &&
        git branch -D branch1 branch2 &&
-       check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc
+       check_changes $head5
  '
  
  cat > expect << EOF
@@@ -388,8 -389,7 +389,8 @@@ test_expect_success 'test --mixed <path
        echo 4 > file4 &&
        echo 5 > file1 &&
        git add file1 file3 file4 &&
 -      test_must_fail git reset HEAD -- file1 file2 file3 &&
 +      git reset HEAD -- file1 file2 file3 &&
 +      test_must_fail git diff --quiet &&
        git diff > output &&
        test_cmp output expect &&
        git diff --cached > output &&
@@@ -403,8 -403,7 +404,8 @@@ test_expect_success 'test resetting th
        >sub/file2 &&
        git update-index --add sub/file1 sub/file2 &&
        T=$(git write-tree) &&
 -      test_must_fail git reset HEAD sub/file2 &&
 +      git reset HEAD sub/file2 &&
 +      test_must_fail git diff --quiet &&
        U=$(git write-tree) &&
        echo "$T" &&
        echo "$U" &&
@@@ -442,8 -441,7 +443,8 @@@ test_expect_success 'resetting specifi
                echo "100644 $F3 3      file2"
        } | git update-index --index-info &&
        git ls-files -u &&
 -      test_must_fail git reset HEAD file2 &&
 +      git reset HEAD file2 &&
 +      test_must_fail git diff --quiet &&
        git diff-index --exit-code --cached HEAD
  '
  
@@@ -452,8 -450,7 +453,8 @@@ test_expect_success 'disambiguation (1)
        git reset --hard &&
        >secondfile &&
        git add secondfile &&
 -      test_must_fail git reset secondfile &&
 +      git reset secondfile &&
 +      test_must_fail git diff --quiet -- secondfile &&
        test -z "$(git diff --cached --name-only)" &&
        test -f secondfile &&
        test ! -s secondfile
@@@ -478,8 -475,7 +479,8 @@@ test_expect_success 'disambiguation (3)
        >secondfile &&
        git add secondfile &&
        rm -f secondfile &&
 -      test_must_fail git reset HEAD secondfile &&
 +      git reset HEAD secondfile &&
 +      test_must_fail git diff --quiet &&
        test -z "$(git diff --cached --name-only)" &&
        test ! -f secondfile
  
@@@ -491,18 -487,9 +492,18 @@@ test_expect_success 'disambiguation (4)
        >secondfile &&
        git add secondfile &&
        rm -f secondfile &&
 -      test_must_fail git reset -- secondfile &&
 +      git reset -- secondfile &&
 +      test_must_fail git diff --quiet &&
        test -z "$(git diff --cached --name-only)" &&
        test ! -f secondfile
  '
  
 +test_expect_success 'reset with paths accepts tree' '
 +      # for simpler tests, drop last commit containing added files
 +      git reset --hard HEAD^ &&
 +      git reset HEAD^^{tree} -- . &&
 +      git diff --cached HEAD^ --exit-code &&
 +      git diff HEAD --exit-code
 +'
 +
  test_done