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

[stgit] / stgit / commands / pull.py

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 15bbed6124f807ec3be211757a86acf3e0c9230e..330cc256d3f7bf410e9ade341dc1b4a3963504bc 100644 (file)
--- 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'