[PATCH 2/2] Warn the user when there is no parent information in the config.
Signed-off-by: Yann Dirson <ydirson@altern.org>
---
stgit/stack.py | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/stgit/stack.py b/stgit/stack.py
index 3960729..9609ed3 100644
--- a/stgit/stack.py
+++ b/stgit/stack.py
@@ -418,8 +418,7 @@ 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 +431,7 @@ 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
Yann Dirson <ydirson@altern.org>