Skip to content

Commit 3458d45

Browse files
fluffybeinggottesmm
authored andcommitted
Include git fetch for tags in update checkout by default (swiftlang#12455)
* include git fetch for tags in update checkout by default * remove extra call to git tags fetch * fix python lint E501 error
1 parent ed43bef commit 3458d45

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

utils/update_checkout.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def get_branch_for_repo(config, repo_name, scheme_name, scheme_map,
7777
echo=True, allow_non_zero_exit=True)
7878
shell.run(["git", "fetch", "origin",
7979
"pull/{0}/merge:{1}"
80-
.format(pr_id, repo_branch)], echo=True)
80+
.format(pr_id, repo_branch), "--tags"], echo=True)
8181
return repo_branch, cross_repo
8282

8383

@@ -128,7 +128,8 @@ def update_single_repository(args):
128128
# It's important that we checkout, fetch, and rebase, in order.
129129
# .git/FETCH_HEAD updates the not-for-merge attributes based on
130130
# which branch was checked out during the fetch.
131-
shell.run(["git", "fetch", "--recurse-submodules=yes"], echo=True)
131+
shell.run(["git", "fetch", "--recurse-submodules=yes", "--tags"],
132+
echo=True)
132133

133134
# If we were asked to reset to the specified branch, do the hard
134135
# reset and return.

0 commit comments

Comments
 (0)