~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the preserving of the local changes during pop
[stgit]
/
stgit
/
commands
/
pop.py
diff --git
a/stgit/commands/pop.py
b/stgit/commands/pop.py
index
7c260a6
..
645eebd
100644
(file)
--- a/
stgit/commands/pop.py
+++ b/
stgit/commands/pop.py
@@
-37,8
+37,8
@@
options = [make_option('-a', '--all',
action = 'store_true'),
make_option('-n', '--number', type = 'int',
help = 'pop the specified number of patches'),
action = 'store_true'),
make_option('-n', '--number', type = 'int',
help = 'pop the specified number of patches'),
- make_option('--keep',
- help = 'keep the
current working directory
',
+ make_option('-
k', '-
-keep',
+ help = 'keep the
local changes
',
action = 'store_true')]
action = 'store_true')]
@@
-48,10
+48,11
@@
def func(parser, options, args):
if len(args) > 1:
parser.error('incorrect number of arguments')
if len(args) > 1:
parser.error('incorrect number of arguments')
+ check_conflicts()
+ check_head_top_equal()
+
if not options.keep:
check_local_changes()
if not options.keep:
check_local_changes()
- check_conflicts()
- check_head_top_equal()
applied = crt_series.get_applied()
if not applied:
applied = crt_series.get_applied()
if not applied: