lock_ref_sha1_basic(): improve diagnostics for ref D/F conflicts

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
index a02a45afd2087debba99e40996b689eac5495191..b77d4c97c1102c4a9bf1313c7e9eb94a6936ac06 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -45,7 +45,7 @@ test_expect_success 'setup' '
        head2=$(git rev-parse --verify HEAD) &&
        head2_short=$(git rev-parse --verify --short $head2) &&
        tree2=$(git rev-parse --verify HEAD:) &&
-       tree2_short=$(git rev-parse --verify --short $tree2)
+       tree2_short=$(git rev-parse --verify --short $tree2) &&
        git config --unset i18n.commitEncoding
 '
 
@@ -358,10 +358,7 @@ test_expect_success 'empty email' '
        test_tick &&
        C=$(GIT_AUTHOR_EMAIL= git commit-tree HEAD^{tree} </dev/null) &&
        A=$(git show --pretty=format:%an,%ae,%ad%n -s $C) &&
-       test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700" || {
-               echo "Eh? $A" >failure
-               false
-       }
+       verbose test "$A" = "A U Thor,,Thu Apr 7 15:14:13 2005 -0700"
 '
 
 test_expect_success 'del LF before empty (1)' '