diff options
| author | Hans Rosenfeld <hans.rosenfeld@nexenta.com> | 2016-01-28 16:18:24 +0100 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2017-07-04 21:32:17 +0000 |
| commit | 28e2b3ad0b14867ee7f3383890f6658e6e9448a1 (patch) | |
| tree | 43361e06850438664bce2afafbfda3f64aa8d222 /usr/src/tools/scripts/git-pbchk.py | |
| parent | 04427e3bf236c18cc532680b957267ee70b1037d (diff) | |
| download | illumos-gate-28e2b3ad0b14867ee7f3383890f6658e6e9448a1.tar.gz | |
5167 git-pbchk fails to detect parent branch
Reviewed by: Dan Fields <dan.fields@nexenta.com>
Reviewed by: Toomas Soome <tsoome@me.com>
Approved by: Robert Mustacchi <rm@joyent.com>
Diffstat (limited to 'usr/src/tools/scripts/git-pbchk.py')
| -rw-r--r-- | usr/src/tools/scripts/git-pbchk.py | 5 |
1 files changed, 3 insertions, 2 deletions
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 <garrett@damore.org> # 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") |