Merge branch 'pb/remote-mirror-config'

diff --git a/t/t1005-read-tree-reset.sh b/t/t1005-read-tree-reset.sh
index f1b12167b8b5d03634e6f1803b1388b07884bd13..b0d31f5a9bb8b3474665147327d94ad5067fa206 100755 (executable)
--- a/t/t1005-read-tree-reset.sh
+++ b/t/t1005-read-tree-reset.sh
@@ -21,10 +21,10 @@ test_expect_success 'setup' '
   git commit -m two
 '
 
-test_expect_failure 'reset should work' '
+test_expect_success 'reset should work' '
   git read-tree -u --reset HEAD^ &&
   git ls-files >actual &&
-  diff -u expect actual
+  test_cmp expect actual
 '
 
 test_done