valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly handle "shared" arg in git.init when it is a bool (#36912)

Browse Source
This commit is contained in:
Erik Johnson 2016-10-11 13:54:15 -05:00 committed by Nicole Thomas
parent bdbf1619cb
commit f3443fb992
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/modules/git.py
View File

@ -1718,7 +1718,8 @@ def init(cwd,
separate_git_dir = str(separate_git_dir)
command.append('--separate-git-dir={0}'.format(separate_git_dir))
if shared is not None:
if isinstance(shared, six.integer_types):
if isinstance(shared, six.integer_types) \
and not isinstance(shared, bool):
shared = '0' + str(shared)
elif not isinstance(shared, six.string_types):
# Using lower here because booleans would be capitalized when