Correct handling of branch.$name.merge in builtin-fetch

diff --git a/t/t7101-reset.sh b/t/t7101-reset.sh
index a9191407f21c748f4c00bf909f670fc2b5124ec3..66d40430b293b2c1f8c7bc72416730e502c41f58 100755 (executable)
--- a/t/t7101-reset.sh
+++ b/t/t7101-reset.sh
@@ -10,7 +10,7 @@ test_expect_success \
     'creating initial files' \
     'mkdir path0 &&
      cp ../../COPYING path0/COPYING &&
-     git-add path0/COPYING &&
+     git add path0/COPYING &&
      git-commit -m add -a'
 
 test_expect_success \
@@ -21,10 +21,10 @@ test_expect_success \
      cp ../../COPYING path1/COPYING &&
      cp ../../COPYING COPYING &&
      cp ../../COPYING path0/COPYING-TOO &&
-     git-add path1/path2/COPYING &&
-     git-add path1/COPYING &&
-     git-add COPYING &&
-     git-add path0/COPYING-TOO &&
+     git add path1/path2/COPYING &&
+     git add path1/COPYING &&
+     git add COPYING &&
+     git add path0/COPYING-TOO &&
      git-commit -m change -a'
 
 test_expect_success \