##// END OF EJS Templates
fix mpr for earlier git version
Matthias BUSSONNIER -
Show More
@@ -6,6 +6,7 b' Usage:'
6 """
6 """
7 from __future__ import print_function
7 from __future__ import print_function
8
8
9 import io, os
9 import argparse
10 import argparse
10 from subprocess import check_call, CalledProcessError
11 from subprocess import check_call, CalledProcessError
11
12
@@ -24,7 +25,7 b' def merge_branch(repo, branch ):'
24 """
25 """
25 # Delete the branch first
26 # Delete the branch first
26 try :
27 try :
27 check_call(['git', 'pull', '--no-edit', repo, branch])
28 check_call(['git', 'pull', repo, branch], stdin=io.open(os.devnull))
28 except CalledProcessError :
29 except CalledProcessError :
29 check_call(['git', 'merge', '--abort'])
30 check_call(['git', 'merge', '--abort'])
30 return False
31 return False
General Comments 0
You need to be logged in to leave comments. Login now