Skip to content

Commit

Permalink
t: be explicit about the branch we're pulling from
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
bk2204 committed Jul 8, 2020
1 parent 57a258c commit d8d2f1e
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion t/t-batch-transfer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)" ]

Expand Down
2 changes: 1 addition & 1 deletion t/t-chunked-transfer-encoding.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)" ]

Expand Down
2 changes: 1 addition & 1 deletion t/t-fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion t/t-happy-path.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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)" ]

Expand Down
2 changes: 1 addition & 1 deletion t/t-reference-clone.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit d8d2f1e

Please sign in to comment.