From: Yann Dirson <ydirson@altern.org>
Date: Sat, 3 Feb 2007 16:04:20 +0000 (+0100)
Subject: Correctly check the pull-does-rebase parameter in 'stg pull'.
X-Git-Tag: v0.14.3~351
X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/commitdiff_plain/76c57fcf79ac80726e2435f6db9e4a5fd892eb75

Correctly check the pull-does-rebase parameter in 'stg pull'.




Signed-off-by: Yann Dirson <ydirson@altern.org>
---

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'