illumos gate

There is a bug in git-pbchk in that it attempts to pass whitespace to Popen() instead of using an array. Furthermore the splitting logic is busted.

Here's my solution, which uses the list form of submission to git() (thereby avoiding the busted format), and doing the split properly by using a scratch array to receive the split(), then checking the results.

--- /opt/onbld/bin/git-pbchk    Mon Sep 15 11:13:27 2014
+++ /tank/garrett/illumos/usr/src/tools/scripts/git-pbchk.py    Tue Jul 22 09:41:14 2014
@@ -122,8 +122,8 @@
     if not branch:
         return None

-    p = git(["for-each-ref", "--format=%(refname:short) %(upstream:short)",
-            "refs/heads/"])
+    p = git("for-each-ref --format=%(refname:short) %(upstream:short) " +
+            "refs/heads/")

     if not p:
         sys.stderr.write("Failed finding git parent branch\\n")
@@ -130,9 +130,9 @@
         sys.exit(err)

     for line in p:
-    arr = line.split()
-    if len(arr) > 1:
-            local, remote = arr[0], arr[1]
+        # Git 1.7 will leave a ' ' trailing any non-tracking branch
+        if ' ' in line and not line.endswith(' \\n'):
+            local, remote = line.split()
             if local == branch:
                 return remote
     return 'origin/master'