~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make stgit.config use git-repo-config.
[stgit]
/
stgit
/
commands
/
refresh.py
diff --git
a/stgit/commands/refresh.py
b/stgit/commands/refresh.py
index
2d164cd
..
7a9bf7d
100644
(file)
--- a/
stgit/commands/refresh.py
+++ b/
stgit/commands/refresh.py
@@
-77,7
+77,7
@@
options = [make_option('-f', '--force',
def func(parser, options, args):
def func(parser, options, args):
- autoresolved = config.get('stgit
', '
autoresolved')
+ autoresolved = config.get('stgit
.
autoresolved')
if autoresolved != 'yes':
check_conflicts()
if autoresolved != 'yes':
check_conflicts()
@@
-144,10
+144,10
@@
def func(parser, options, args):
committer_email = options.commemail,
backup = True, sign_str = sign_str)
committer_email = options.commemail,
backup = True, sign_str = sign_str)
+ print 'done'
+
if options.patch:
between.reverse()
push_patches(between)
if options.patch:
between.reverse()
push_patches(between)
-
- print 'done'
else:
print 'Patch "%s" is already up to date' % patch
else:
print 'Patch "%s" is already up to date' % patch