summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2017-10-13 15:40:33 +0000
committerJavier Jardón <jjardon@gnome.org>2017-10-13 15:40:33 +0000
commitdaeb29e2f43e76b2215de23398ae783553311745 (patch)
tree525e3ddaae42f7d6542af96ad541e11ccdcae5bd
parentedf200386687460864c78d75d5e37ac102b17e87 (diff)
parentc8e389918aa29e0987ec02b7744300b2bb86c095 (diff)
downloadybd-daeb29e2f43e76b2215de23398ae783553311745.tar.gz
Merge branch 'benbrown/old-git-sha-contains' into 'master'
Use branch in place of for-each-ref See merge request baserock/ybd!393
-rw-r--r--ybd/repos.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ybd/repos.py b/ybd/repos.py
index 75685fb..1b4da71 100644
--- a/ybd/repos.py
+++ b/ybd/repos.py
@@ -115,8 +115,8 @@ def ensure_ref_contains_sha(dn, gitdir, ref, sha):
def sha_in_ref():
try:
- return bool(check_output(['git', 'for-each-ref', '--contains',
- sha, 'refs/*/' + ref], stderr=fnull,
+ return bool(check_output(['git', 'branch', '--contains',
+ sha, ref], stderr=fnull,
universal_newlines=True).strip())
except:
return False