~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
15bbed6
..
330cc25
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)
# 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'
git.reset(tree_id = git.rev_parse(crt_series.get_parent_branch()))
print 'done'