From 692e17964dd4f8da4b3994c5c7055ec9a8c22a75 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Sat, 26 Sep 2015 09:54:58 +0200 Subject: git-p4: add optional type specifier to gitConfig reader The functions "gitConfig" and "gitConfigBool" are almost identical. Make "gitConfig" more generic by adding an optional type specifier. Use the type specifier "--bool" with "gitConfig" to implement "gitConfigBool. This prepares the implementation of other type specifiers such as "--int". Signed-off-by: Lars Schneider Acked-by: Luke Diamand Signed-off-by: Junio C Hamano --- git-p4.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'git-p4.py') diff --git a/git-p4.py b/git-p4.py index 0093fa3d8..206a45f61 100755 --- a/git-p4.py +++ b/git-p4.py @@ -604,9 +604,12 @@ def gitBranchExists(branch): _gitConfig = {} -def gitConfig(key): +def gitConfig(key, typeSpecifier=None): if not _gitConfig.has_key(key): - cmd = [ "git", "config", key ] + cmd = [ "git", "config" ] + if typeSpecifier: + cmd += [ typeSpecifier ] + cmd += [ key ] s = read_pipe(cmd, ignore_error=True) _gitConfig[key] = s.strip() return _gitConfig[key] @@ -617,10 +620,7 @@ def gitConfigBool(key): in the config.""" if not _gitConfig.has_key(key): - cmd = [ "git", "config", "--bool", key ] - s = read_pipe(cmd, ignore_error=True) - v = s.strip() - _gitConfig[key] = v == "true" + _gitConfig[key] = gitConfig(key, '--bool') == "true" return _gitConfig[key] def gitConfigList(key): -- cgit v1.2.1