X-Git-Url: https://git.distorted.org.uk/~mdw/stgit/blobdiff_plain/c0167829ce790a0812f16ae03d1c7c7bd7b14560..HEAD:/stgit/commands/pull.py diff --git a/stgit/commands/pull.py b/stgit/commands/pull.py index 330cc25..b63ef7a 100644 --- a/stgit/commands/pull.py +++ b/stgit/commands/pull.py @@ -73,8 +73,8 @@ def func(parser, options, args): print 'Pulling from "%s"...' % repository git.fetch(repository) 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 'rebasing to "%s"...' % git.fetch_head() + git.reset(tree_id = git.fetch_head()) print 'done' # push the patches back