Skip to content

Commit 0eebbde

Browse files
committed
---
yaml --- r: 346855 b: refs/heads/master c: d129aab h: refs/heads/master i: 346853: 2b3207a 346851: efc4d98 346847: 2c3c2d2
1 parent a68d121 commit 0eebbde

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: d0786b835943f32e2e46581b3e48cb0155199119
2+
refs/heads/master: d129aab2bc5209b0b53f38b3dca02ab3f873ad7d
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/utils/update_checkout/update_checkout/update_checkout.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -223,20 +223,24 @@ def obtain_additional_swift_sources(pool_args):
223223
print("Cloning '" + repo_name + "'")
224224

225225
if skip_history:
226-
shell.run(['git', 'clone', '--recursive', '--depth', '1',
227-
'--branch', repo_branch, remote, repo_name],
226+
shell.run(['env', 'GIT_TERMINAL_PROMPT=0', 'git', 'clone',
227+
'--recursive', '--depth', '1', '--branch',
228+
repo_branch, remote, repo_name],
228229
echo=True)
229230
else:
230-
shell.run(['git', 'clone', '--recursive', remote,
231-
repo_name], echo=True)
231+
shell.run(['env', 'GIT_TERMINAL_PROMPT=0', 'git', 'clone',
232+
'--recursive', remote, repo_name],
233+
echo=True)
232234
if scheme_name:
233235
src_path = os.path.join(SWIFT_SOURCE_ROOT, repo_name, ".git")
234-
shell.run(['git', '--git-dir', src_path, '--work-tree',
236+
shell.run(['env', 'GIT_TERMINAL_PROMPT=0', 'git', '--git-dir',
237+
src_path, '--work-tree',
235238
os.path.join(SWIFT_SOURCE_ROOT, repo_name),
236239
'checkout', repo_branch], echo=False)
237240
with shell.pushd(os.path.join(SWIFT_SOURCE_ROOT, repo_name),
238241
dry_run=False, echo=False):
239-
shell.run(["git", "submodule", "update", "--recursive"],
242+
shell.run(['env', 'GIT_TERMINAL_PROMPT=0', "git", "submodule",
243+
"update", "--recursive"],
240244
echo=False)
241245

242246

0 commit comments

Comments
 (0)