From: Yann Dirson Date: Sat, 03 Feb 2007 16:04:20 GMT Subject: [PATCH 1/2] Correctly check the pull-does-rebase parameter in 'stg pull'. Message-ID: <20070203160420.32054.20462.stgit@gandelf.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'