Use FETCH_HEAD to know where to rebase to after pull.

[stgit] / stgit / commands / pull.py

diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py
index 15bbed6..b63ef7a 100644 (file)
--- a/stgit/commands/pull.py
+++ b/stgit/commands/pull.py
@@ -72,8 +72,9 @@ def func(parser, options, args):
     # pull the remote changes
     print 'Pulling from "%s"...' % repository
     git.fetch(repository)
-    if (config.get('stgit.pull-does-rebase')):
-        git.reset(tree_id = git.rev_parse(crt_series.get_parent_branch()))
+    if (config.get('stgit.pull-does-rebase') == 'yes'):
+        print 'rebasing to "%s"...' % git.fetch_head()
+        git.reset(tree_id = git.fetch_head())
     print 'done'
 
     # push the patches back