From c0167829ce790a0812f16ae03d1c7c7bd7b14560 Mon Sep 17 00:00:00 2001 From: Yann Dirson Date: Sat, 3 Feb 2007 17:04:25 +0100 Subject: [PATCH] Warn the user when there is no parent information in the config. Signed-off-by: Yann Dirson --- stgit/stack.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/stgit/stack.py b/stgit/stack.py index 3960729..6f0f67a 100644 --- a/stgit/stack.py +++ b/stgit/stack.py @@ -418,8 +418,9 @@ class Series(StgitObject): 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. + 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 @@ -432,8 +433,9 @@ 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. + 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 -- 2.11.0