From bab981111890d537496542cdd094f893957f11d9 2012-07-25 08:04:55 From: Matthias BUSSONNIER Date: 2012-07-25 08:04:55 Subject: [PATCH] fix mpr for earlier git version --- diff --git a/tools/git-mpr.py b/tools/git-mpr.py index 7c49091..9622dc1 100755 --- a/tools/git-mpr.py +++ b/tools/git-mpr.py @@ -6,6 +6,7 @@ Usage: """ from __future__ import print_function +import io, os import argparse from subprocess import check_call, CalledProcessError @@ -24,7 +25,7 @@ def merge_branch(repo, branch ): """ # Delete the branch first try : - check_call(['git', 'pull', '--no-edit', repo, branch]) + check_call(['git', 'pull', repo, branch], stdin=io.open(os.devnull)) except CalledProcessError : check_call(['git', 'merge', '--abort']) return False