Merge branch 'nd/clone-linked-checkout'

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index ddea49808d063f6c169cf8078f5698e34c2ba803..cdaf6f64ec78830def2f082b72604075e15496f6 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -59,7 +59,7 @@ test_expect_success 'git branch -l d/e/f should create a branch and a log' '
 test_expect_success 'git branch -d d/e/f should delete a branch and a log' '
        git branch -d d/e/f &&
        test_path_is_missing .git/refs/heads/d/e/f &&
-       test_path_is_missing .git/logs/refs/heads/d/e/f
+       test_must_fail git reflog exists refs/heads/d/e/f
 '
 
 test_expect_success 'git branch j/k should work after branch j has been deleted' '
@@ -82,13 +82,13 @@ test_expect_success 'git branch -m dumps usage' '
 test_expect_success 'git branch -m m m/m should work' '
        git branch -l m &&
        git branch -m m m/m &&
-       test_path_is_file .git/logs/refs/heads/m/m
+       git reflog exists refs/heads/m/m
 '
 
 test_expect_success 'git branch -m n/n n should work' '
        git branch -l n/n &&
        git branch -m n/n n &&
-       test_path_is_file .git/logs/refs/heads/n
+       git reflog exists refs/heads/n
 '
 
 test_expect_success 'git branch -m o/o o should fail when o/p exists' '
@@ -267,12 +267,12 @@ git config branch.s/s.dummy Hello
 
 test_expect_success 'git branch -m s/s s should work when s/t is deleted' '
        git branch -l s/s &&
-       test_path_is_file .git/logs/refs/heads/s/s &&
+       git reflog exists refs/heads/s/s &&
        git branch -l s/t &&
-       test_path_is_file .git/logs/refs/heads/s/t &&
+       git reflog exists refs/heads/s/t &&
        git branch -d s/t &&
        git branch -m s/s s &&
-       test_path_is_file .git/logs/refs/heads/s
+       git reflog exists refs/heads/s
 '
 
 test_expect_success 'config information was renamed, too' '