summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcontrib/remote-helpers/git-remote-hg12
1 files changed, 8 insertions, 4 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 62c39db5b4..016cdadb4d 100755
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -56,6 +56,12 @@ def hgmode(mode):
m = { '0100755': 'x', '0120000': 'l' }
return m.get(mode, '')
+def get_config(config):
+ cmd = ['git', 'config', '--get', config]
+ process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+ output, _ = process.communicate()
+ return output
+
class Marks:
def __init__(self, path):
@@ -727,12 +733,10 @@ def main(args):
hg_git_compat = False
track_branches = True
try:
- cmd = ['git', 'config', '--get', 'remote-hg.hg-git-compat']
- if subprocess.check_output(cmd) == 'true\n':
+ if get_config('remote-hg.hg-git-compat') == 'true\n':
hg_git_compat = True
track_branches = False
- cmd = ['git', 'config', '--get', 'remote-hg.track-branches']
- if subprocess.check_output(cmd) == 'false\n':
+ if get_config('remote-hg.track-branches') == 'false\n':
track_branches = False
except subprocess.CalledProcessError:
pass