From: Yann Dirson Date: Thu, 01 Feb 2007 23:48:10 GMT Subject: [PATCH 3/3] Do not return 'origin' as parent remote when there is no such remote. Message-ID: <20070201234810.3313.72720.stgit@gandelf.nowhere.earth> In-Reply-To: <20070201234534.3313.10426.stgit@gandelf.nowhere.earth> Signed-off-by: Yann Dirson --- stgit/stack.py | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/stgit/stack.py b/stgit/stack.py index dbdda01..729b77e 100644 --- a/stgit/stack.py +++ b/stgit/stack.py @@ -408,7 +408,15 @@ 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(): + # FIXME: this is for compatibility only. Should be + # dropped when all relevant commands record this info. + 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) @@ -418,6 +426,8 @@ class Series(StgitObject): if value: return value elif git.rev_parse('heads/origin'): + # FIXME: this is for compatibility only. Should be + # dropped when all relevant commands record this info. return 'heads/origin' else: raise StackException, 'Cannot find a parent branch for "%s"' % self.__name