Add an option to delete a patch from a certain branch

[stgit] / stgit / git.py

diff --git a/stgit/git.py b/stgit/git.py
index 25d9483..3137797 100644 (file)
--- a/stgit/git.py
+++ b/stgit/git.py
@@ -470,7 +470,7 @@ def merge(base, head1, head2):
         raise GitException, 'git-read-tree failed (local changes maybe?)'
 
     # this can fail if there are conflicts
-    if os.system('git-merge-index -o -q gitmergeonefile.py -a') != 0:
+    if __run('git-merge-index -o -q gitmergeonefile.py -a') != 0:
         raise GitException, 'git-merge-index failed (possible conflicts)'
 
 def status(files = [], modified = False, new = False, deleted = False,