~mdw
/
stgit
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix git.reset() to remove the added files
[stgit]
/
stgit
/
stack.py
diff --git
a/stgit/stack.py
b/stgit/stack.py
index
975ac21
..
f83161b
100644
(file)
--- a/
stgit/stack.py
+++ b/
stgit/stack.py
@@
-818,7
+818,7
@@
class Series:
merged = []
for p in patches:
- if git.apply_diff(p.get_top(), p.get_bottom()
, False
):
+ if git.apply_diff(p.get_top(), p.get_bottom()):
merged.append(p.get_name())
merged.reverse()