~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
330cc25
..
b63ef7a
100644
(file)
--- 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 '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
print 'done'
# push the patches back