diff options
| author | Patrick Mooney <pmooney@pfmooney.com> | 2017-07-05 18:18:21 +0000 |
|---|---|---|
| committer | Patrick Mooney <pmooney@pfmooney.com> | 2017-07-05 18:18:21 +0000 |
| commit | e207f19539a82d54279d458fc3c449d519207e2b (patch) | |
| tree | 1171f739548341542148eb768cbd830def090ee1 /usr/src/tools/scripts/git-pbchk.py | |
| parent | 75647a92265dde475f2caca5f9d959ecf9f8b633 (diff) | |
| parent | 28e2b3ad0b14867ee7f3383890f6658e6e9448a1 (diff) | |
| download | illumos-joyent-release-20170706.tar.gz | |
[illumos-gate merge]release-20170706
commit 28e2b3ad0b14867ee7f3383890f6658e6e9448a1
5167 git-pbchk fails to detect parent branch
commit 04427e3bf236c18cc532680b957267ee70b1037d
4703 would like xargs support for -P
commit 87bdc12930bfa66277c45510e399f8a01e06c376
8425 boot: create_ramdisk needs cleanup
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") |