From d8d2f1e937a4aa753bbc41f95cc1dbb05de4e815 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Mon, 29 Jun 2020 15:55:07 +0000 Subject: [PATCH] t: be explicit about the branch we're pulling from When we invoke "git pull", be explicit about where we're pulling from. Git will set some default values for us, but if we want to support a branch name that isn't the default, we need to be explicit. --- t/t-batch-transfer.sh | 2 +- t/t-chunked-transfer-encoding.sh | 2 +- t/t-fetch.sh | 2 +- t/t-happy-path.sh | 2 +- t/t-reference-clone.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t-batch-transfer.sh b/t/t-batch-transfer.sh index 878a690560..985472ce83 100755 --- a/t/t-batch-transfer.sh +++ b/t/t-batch-transfer.sh @@ -57,7 +57,7 @@ begin_test "batch transfer" # change to the clone's working directory cd ../clone - git pull + git pull origin master [ "a" = "$(cat a.dat)" ] diff --git a/t/t-chunked-transfer-encoding.sh b/t/t-chunked-transfer-encoding.sh index 43a9687442..3c9d97741d 100755 --- a/t/t-chunked-transfer-encoding.sh +++ b/t/t-chunked-transfer-encoding.sh @@ -56,7 +56,7 @@ begin_test "chunked transfer encoding" # change to the clone's working directory cd ../clone - git pull 2>&1 + git pull origin master 2>&1 [ "a" = "$(cat a.dat)" ] diff --git a/t/t-fetch.sh b/t/t-fetch.sh index 529bc317a3..7073f6b797 100755 --- a/t/t-fetch.sh +++ b/t/t-fetch.sh @@ -515,7 +515,7 @@ begin_test "fetch with no origin remote" cd ../no-remote-clone # pull commits & lfs - git pull 2>&1 + git pull origin master 2>&1 assert_local_object "$contents_oid" 1 # now checkout detached HEAD so we're not tracking anything on remote diff --git a/t/t-happy-path.sh b/t/t-happy-path.sh index 12745cde98..851047ef65 100755 --- a/t/t-happy-path.sh +++ b/t/t-happy-path.sh @@ -56,7 +56,7 @@ begin_test "happy path" # change to the clone's working directory cd ../clone - git pull + git pull origin master [ "a" = "$(cat a.dat)" ] diff --git a/t/t-reference-clone.sh b/t/t-reference-clone.sh index fc4da81b48..5cd0033e66 100755 --- a/t/t-reference-clone.sh +++ b/t/t-reference-clone.sh @@ -84,7 +84,7 @@ begin_test "fetch from clone reference" delete_server_object "$reponame" "$oid" cd "$repo_dir" - GIT_LFS_SKIP_SMUDGE=1 git pull + GIT_LFS_SKIP_SMUDGE=1 git pull origin master git lfs pull assert_pointer "master" "a.dat" "$oid" 1