From: Pavel Roskin <proski@gnu.org>
Date: Wed, 10 Jan 2007 19:38:25 +0000 (+0000)
Subject: Check git pull remote before defaulting to 'origin'
X-Git-Tag: v0.14.3~378
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/87c6953990e0cf1522df4816f33674362303035f

Check git pull remote before defaulting to 'origin'

Check git pull remote before defaulting to 'origin'

Signed-off-by: Pavel Roskin <proski@gnu.org>
---

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 227249e..7c5db22 100644
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -50,10 +50,16 @@ def func(parser, options, args):
     if len(args) > 2:
         parser.error('incorrect number of arguments')
 
-    repository = 'origin'
-    refspec = None
     if len(args) >= 1:
         repository = args[0]
+    else:
+        section = 'branch "%s"' % git.get_head_file()
+        if config.has_option(section, 'remote'):
+            repository = config.get(section, 'remote')
+        else:
+            repository = 'origin'
+
+    refspec = None
     if len(args) == 2:
         refspec = args[1]