chiark
/
gitweb
/
~mdw
/
stgit
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
0aa48e8
)
Allow pick --fold to work without applied patches
author
Catalin Marinas
<catalin.marinas@gmail.com>
Sat, 8 Nov 2008 21:18:08 +0000
(21:18 +0000)
committer
Catalin Marinas
<catalin.marinas@gmail.com>
Sat, 8 Nov 2008 21:36:10 +0000
(21:36 +0000)
This patch fixes bug #12517. While there may be other variants for
achieving the same, it makes sense not to restrict the --fold option.
Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
stgit/commands/pick.py
patch
|
blob
|
blame
|
history
diff --git
a/stgit/commands/pick.py
b/stgit/commands/pick.py
index 760918b8eff90c0942aa553833588610498c0103..0fc54b8296154c4757508c68b75109ba42aa6b3d 100644
(file)
--- a/
stgit/commands/pick.py
+++ b/
stgit/commands/pick.py
@@
-177,7
+177,7
@@
def func(parser, options, args):
if options.parent:
raise CmdException, '--parent can only be specified with one patch'
- if
(options.fold or options.update)
and not crt_series.get_current():
+ if
options.update
and not crt_series.get_current():
raise CmdException, 'No patches applied'
if commit_id: