From 28e2b3ad0b14867ee7f3383890f6658e6e9448a1 Mon Sep 17 00:00:00 2001 From: Hans Rosenfeld Date: Thu, 28 Jan 2016 16:18:24 +0100 Subject: 5167 git-pbchk fails to detect parent branch Reviewed by: Dan Fields Reviewed by: Toomas Soome Approved by: Robert Mustacchi --- usr/src/tools/scripts/git-pbchk.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'usr/src/tools/scripts/git-pbchk.py') diff --git a/usr/src/tools/scripts/git-pbchk.py b/usr/src/tools/scripts/git-pbchk.py index fea1aa4b2e..d8a3e19bf3 100644 --- a/usr/src/tools/scripts/git-pbchk.py +++ b/usr/src/tools/scripts/git-pbchk.py @@ -20,6 +20,7 @@ # Copyright 2014 Garrett D'Amore # Copyright (c) 2014, Joyent, Inc. # Copyright (c) 2015, 2016 by Delphix. All rights reserved. +# Copyright 2016 Nexenta Systems, Inc. # import getopt @@ -121,8 +122,8 @@ def git_parent_branch(branch): 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") -- cgit v1.2.3