[Libreoffice-commits] dev-tools.git: bibisect/mergeranges

[Robinson Tryon]

 bibisect/mergeranges |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit b739129abc410445d9baa32179885009903ad703
Author: Robinson Tryon <qubit at runcibility.com>
Date:   Wed Dec 4 04:53:58 2013 -0500

    Bibisect: Clarify tag code; silently overwrite tags if they exist
    
    Change-Id: I60d4f53a36add7db39c097d7d7311d0351cb1b54
    Reviewed-on: https://gerrit.libreoffice.org/6920
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
    Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/bibisect/mergeranges b/bibisect/mergeranges
index 58dff4f..d7416c2 100755
--- a/bibisect/mergeranges
+++ b/bibisect/mergeranges
@@ -57,10 +57,15 @@ def cherry_pick_theirs(revision):
     # such as 'bibisect.sh' or 'run-libreoffice.sh') will be left in
     # place and not committed to the repository.
     justrunit(['git', 'commit', '-C', revision])
-    tag = subprocess.check_output(['git', 'log', '-1', '--pretty=%s', 'HEAD']).decode('utf-8').rstrip()
-    justrunit(['git', 'tag', tag])
-    
 
+    # Create a tag using the first line of the commit message we just
+    # picked.
+    argsHeadTag = ['git', 'log', '-1', '--pretty=%s', 'HEAD']
+    tag = subrun(argsHeadTag).rstrip()
+
+    # Tag our cherry-picked commit. If the tag already exists, replace
+    # it (quietly).
+    justrunit(['git', 'tag', '-f', tag])
 
 # Take input from the 'ranges' file passed-in on the command line.
 for line in open(sys.argv[1]).readlines():