# [PATCH 0/2] Minor stgit touches 3 messages from 2007-02-03 to 2007-02-03. Participants: Yann Dirson. Thread: https://gitlist.dev/t/6640 ## Yann Dirson, 2007-02-03 16:04 Subject: [PATCH 0/2] Minor stgit touches Message-ID: <20070203160257.32054.17787.stgit@gandelf.nowhere.earth> URL: https://gitlist.dev/e/20070203160257.32054.17787.stgit%40gandelf.nowhere.earth ``` Here is one bugfix, and the addition of a notice to the user when we fallback to "origin" as a parent because of the lack of config parameters. -- Yann Dirson | Debian-related: | Support Debian GNU/Linux: | Freedom, Power, Stability, Gratis http://ydirson.free.fr/ | Check ``` ## Yann Dirson, 2007-02-03 16:04 Subject: [PATCH 1/2] Correctly check the pull-does-rebase parameter in 'stg pull'. Message-ID: <20070203160420.32054.20462.stgit@gandelf.nowhere.earth> URL: https://gitlist.dev/e/20070203160420.32054.20462.stgit%40gandelf.nowhere.earth In-Reply-To: <20070203160257.32054.17787.stgit@gandelf.nowhere.earth> ``` Signed-off-by: Yann Dirson --- stgit/commands/pull.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py index 15bbed6..330cc25 100644 --- a/stgit/commands/pull.py +++ b/stgit/commands/pull.py @@ -72,7 +72,8 @@ def func(parser, options, args): # pull the remote changes print 'Pulling from "%s"...' % repository git.fetch(repository) - if (config.get('stgit.pull-does-rebase')): + if (config.get('stgit.pull-does-rebase') == 'yes'): + print "rebasing to '%s'..." % crt_series.get_parent_branch() git.reset(tree_id = git.rev_parse(crt_series.get_parent_branch())) print 'done' ``` ## Yann Dirson, 2007-02-03 16:04 Subject: [PATCH 2/2] Warn the user when there is no parent information in the config. Message-ID: <20070203160425.32054.75599.stgit@gandelf.nowhere.earth> URL: https://gitlist.dev/e/20070203160425.32054.75599.stgit%40gandelf.nowhere.earth In-Reply-To: <20070203160257.32054.17787.stgit@gandelf.nowhere.earth> ``` Signed-off-by: Yann Dirson --- 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 ```