X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/c1e4d7e01fb8627f6d07f12f18007018b0625c2a..c0167829ce790a0812f16ae03d1c7c7bd7b14560:/stgit/stack.py

diff --git a/stgit/stack.py b/stgit/stack.py
index f57e4f0..6f0f67a 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -414,7 +414,16 @@ class Series(StgitObject):
         self._set_field('description', line)
 
     def get_parent_remote(self):
-        return config.get('branch.%s.remote' % self.__name) or 'origin'
+        value = config.get('branch.%s.remote' % self.__name)
+        if value:
+            return value
+        elif 'origin' in git.remotes_list():
+            print 'Notice: no parent remote declared for stack "%s", defaulting to "origin".' \
+                  'Consider setting "branch.%s.remote" with "git repo-config".' \
+                  % (self.__name, self.__name)
+            return 'origin'
+        else:
+            raise StackException, 'Cannot find a parent remote for "%s"' % self.__name
 
     def __set_parent_remote(self, remote):
         value = config.set('branch.%s.remote' % self.__name, remote)
@@ -424,6 +433,9 @@ class Series(StgitObject):
         if value:
             return value
         elif git.rev_parse('heads/origin'):
+            print 'Notice: no parent branch declared for stack "%s", defaulting to "heads/origin".' \
+                  'Consider setting "branch.%s.merge" with "git repo-config".' \
+                  % (self.__name, self.__name)
             return 'heads/origin'
         else:
             raise StackException, 'Cannot find a parent branch for "%s"' % self.__name