From 962ef1c731f01f4d6c146c2af88d69fcc7d023a9 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Wed, 26 Oct 2005 14:52:00 -0400 Subject: [PATCH] Use __run instead of os.system() in git.merge() This is just a little faster, avoiding an unneeded invocation of the shell. Signed-off-by: Chuck Lever --- stgit/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stgit/git.py b/stgit/git.py index 25d9483..3137797 100644 --- 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, -- 2.11.0