Merge branch 'master' of https://github.com/ChrisMarinos/git-fat

Add ability to locally specify variables like rsync.sshuser

* 'master' of https://github.com/ChrisMarinos/git-fat:
  allow fat settings to come from global git configuration

1 files changed, 3 insertions, 1 deletions

diff --git a/git-fat b/git-fat
index 7edb7ba..9d4b1a1 100755
--- a/git-fat
+++ b/git-fat
@@ -105,8 +105,10 @@ def gitconfig_get(name, file=None):
     args.append(name)
     p = subprocess.Popen(args, stdout=subprocess.PIPE)
     output = p.communicate()[0].strip()
-    if p.returncode != 0:
+    if p.returncode and file is None:
         return None
+    elif p.returncode:
+        return gitconfig_get(name)
     else:
         return output
 def gitconfig_set(name, value, file=None):