Merge branch 'master' of git://repo.or.cz/git/fastimport

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index a6ea0f6a196c5285c229021c96bb83f33a3aa748..5565c27033ab89959f2a39dfa9abaea99e40432b 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -48,7 +48,7 @@ test_expect_success \
         test ! -f .git/logs/refs/heads/d/e/f'
 
 cat >expect <<EOF
-0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000     checkout: Created from master^0
+0000000000000000000000000000000000000000 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000     checkout: Created from master
 EOF
 test_expect_success \
     'git checkout -b g/h/i -l should create a branch and a log' \
@@ -94,7 +94,7 @@ test_expect_failure \
          git-branch r &&
          git-branch -m q r/q'
 
-git-repo-config branch.s/s.dummy Hello
+git-config branch.s/s.dummy Hello
 
 test_expect_success \
     'git branch -m s/s s should work when s/t is deleted' \
@@ -107,8 +107,8 @@ test_expect_success \
         test -f .git/logs/refs/heads/s'
 
 test_expect_success 'config information was renamed, too' \
-       "test $(git-repo-config branch.s.dummy) = Hello &&
-        ! git-repo-config branch.s/s/dummy"
+       "test $(git-config branch.s.dummy) = Hello &&
+        ! git-config branch.s/s/dummy"
 
 test_expect_failure \
     'git-branch -m u v should fail when the reflog for u is a symlink' \