commit 2f72029dd617eb97e23189b9b7c99cc5c5516919
author Rico Wind <ricow@google.com> Fri Oct 06 14:32:12 2017 +0200
committer Rico Wind <ricow@google.com> Fri Oct 06 12:32:37 2017 +0000
tree 867e71069d21bd26fb7e496be59ee72a2607111b
parent 894eaec270f6d10360a1f480a4d864f3737ef687

Use more robust command for getting branches that a commit is on

Bug: 67491672
Change-Id: I2719777d1161eb95e2dea9071dff72b9fb3eaa75

tools/archive.py

diff --git a/tools/archive.py b/tools/archive.py
index 0ae7233..4e36724 100755
--- a/tools/archive.py
+++ b/tools/archive.py
@@ -29,7 +29,7 @@
   return subprocess.check_output(['git', 'rev-parse', 'HEAD']).strip()
 
 def IsMaster(version):
-  branches = subprocess.check_output(['git', 'show', '-s', '--pretty=%d',
+  branches = subprocess.check_output(['git', 'branch', '-r', '--contains',
                                       'HEAD'])
   if not version.endswith('-dev'):
     # Sanity check, we don't want to archive on top of release builds EVER