summaryrefslogtreecommitdiffstats
path: root/lldb/scripts
diff options
context:
space:
mode:
authorSean Callanan <scallanan@apple.com>2017-03-03 23:13:30 +0000
committerSean Callanan <scallanan@apple.com>2017-03-03 23:13:30 +0000
commit56435c91c978c97023cca90c0f9a7c9b659a3bf3 (patch)
tree3207359963aae6fa63b4691190aca9b2743ccbf3 /lldb/scripts
parent3e6a7afd8195d5d8ac28fb1b7e1c28f763d73a2e (diff)
downloadbcm5719-llvm-56435c91c978c97023cca90c0f9a7c9b659a3bf3.tar.gz
bcm5719-llvm-56435c91c978c97023cca90c0f9a7c9b659a3bf3.zip
Fixed repo.py to not send git errors to stderr.
Some repos are not git repos, so git is expected to fail. These errors should not go to stderr, because Xcode interprets them as failures. llvm-svn: 296924
Diffstat (limited to 'lldb/scripts')
-rw-r--r--lldb/scripts/Xcode/repo.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/scripts/Xcode/repo.py b/lldb/scripts/Xcode/repo.py
index d6e1aeef873..c1e5fe339d2 100644
--- a/lldb/scripts/Xcode/repo.py
+++ b/lldb/scripts/Xcode/repo.py
@@ -11,7 +11,7 @@ def identifier():
except:
pass
try:
- git_remote_and_branch = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"]).rstrip()
+ git_remote_and_branch = subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"], stderr=subprocess.STDOUT).rstrip()
git_remote = git_remote_and_branch.split("/")[0]
git_branch = "/".join(git_remote_and_branch.split("/")[1:])
git_url = subprocess.check_output(["git", "remote", "get-url", git_remote]).rstrip()
OpenPOWER on IntegriCloud