chiark
/
gitweb
/
~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 975ac210563e159492ca99ca030b1d39976ab314..f83161bd28cb2e9b49d13df8d9a7ddad54b9e376 100644
(file)
--- a/
stgit/stack.py
+++ b/
stgit/stack.py
@@
-818,7
+818,7
@@
class Series:
merged = []
for p in patches:
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()
merged.append(p.get_name())
merged.reverse()