diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-30 01:56:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-30 01:56:45 (GMT) |
| commit | 36b5b3c65948694d9a92de5a17f2b97c3cd84879 (patch) | |
| tree | fa20efe758607290af652d3c32b110a483059b86 /git-merge-recursive.py | |
| parent | 34801cab72e8262d2585f72f15b62a397f0c6c1a (diff) | |
| parent | 8fedb83c05d4b3d877a220d614e8b9d40f02709d (diff) | |
| download | git-36b5b3c65948694d9a92de5a17f2b97c3cd84879.zip git-36b5b3c65948694d9a92de5a17f2b97c3cd84879.tar.gz git-36b5b3c65948694d9a92de5a17f2b97c3cd84879.tar.bz2 | |
Merge fixes up to GIT 1.1.6
Diffstat (limited to 'git-merge-recursive.py')
| -rwxr-xr-x | git-merge-recursive.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 56c3641..b17c8e5 100755 --- a/git-merge-recursive.py +++ b/git-merge-recursive.py @@ -205,11 +205,16 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode, orig = runProgram(['git-unpack-file', oSha]).rstrip() src1 = runProgram(['git-unpack-file', aSha]).rstrip() src2 = runProgram(['git-unpack-file', bSha]).rstrip() - [out, code] = runProgram(['merge', - '-L', branch1Name + '/' + aPath, - '-L', 'orig/' + oPath, - '-L', branch2Name + '/' + bPath, - src1, orig, src2], returnCode=True) + try: + [out, code] = runProgram(['merge', + '-L', branch1Name + '/' + aPath, + '-L', 'orig/' + oPath, + '-L', branch2Name + '/' + bPath, + src1, orig, src2], returnCode=True) + except ProgramError, e: + print >>sys.stderr, e + die("Failed to execute 'merge'. merge(1) is used as the " + "file-level merge tool. Is 'merge' in your path?") sha = runProgram(['git-hash-object', '-t', 'blob', '-w', src1]).rstrip() |