t: set both remote and merge settings for push and pull

When cloning an empty repository, Git will set branch.master.remote, but
if our default branch name is different, Git won't set that value.
Without the remote setting, Git won't push or pull from the remote as
our tests expect it to, and the operation will fail, even though we've
set branch.*.merge.

Make sure that whenever we expect these values to be set that we either
set them both explicitly or use git push -u to set them both for us.

t/t-lock.sh

@@ -36,6 +36,7 @@ begin_test "lock with good tracked ref"
 
   git config push.default upstream
   git config branch.master.merge refs/heads/tracked
+  git config branch.master.remote origin
   git push origin master
 
   git lfs lock "a.dat" --json 2>&1 | tee lock.json

t/t-pre-push.sh

@@ -894,6 +894,7 @@ begin_test "pre-push locks verify 403 with good tracked ref"
 
   git config push.default upstream
   git config branch.master.merge refs/heads/tracked
+  git config branch.master.remote origin
   git config "lfs.$GITSERVER/$reponame.git.locksverify" true
   git push 2>&1 | tee push.log
 

t/t-pull.sh

@@ -60,6 +60,8 @@ begin_test "pull"
   cd ../clone
 
   echo "normal pull"
+  git config branch.master.remote origin
+  git config branch.master.merge refs/heads/master
   git pull 2>&1
 
   [ "a" = "$(cat a.dat)" ]
@@ -296,6 +298,8 @@ begin_test "pull: with missing object"
   refute_server_object "$reponame" "$contents_oid"
 
   # should return non-zero, but should also download all the other valid files too
+  git config branch.master.remote origin
+  git config branch.master.merge refs/heads/master
   git lfs pull 2>&1 | tee pull.log
   pull_exit="${PIPESTATUS[0]}"
   [ "$pull_exit" != "0" ]

t/t-status.sh

@@ -426,7 +426,7 @@ begin_test "status (unpushed objects)"
   git add .gitattributes
   git commit -m "initial commit"
 
-  git push origin master
+  git push -u origin master
 
   contents="a"
   oid="$(calc_oid "$contents")"
@@ -477,7 +477,7 @@ begin_test "status (deleted files)"
   git add .gitattributes
   git commit -m "initial commit"
 
-  git push origin master
+  git push -u origin master
 
   contents="a"
   oid="$(calc_oid "$contents")"

t/t-unlock.sh

@@ -42,6 +42,7 @@ begin_test "unlocking a lock by path with tracked ref"
 
   git config push.default upstream
   git config branch.master.merge refs/heads/tracked
+  git config branch.master.remote origin
   git push origin master
 
   git lfs lock --json "c.dat" | tee lock.log