diff options
| author | Fredrik Kuivinen <freku045@student.liu.se> | 2006-01-29 13:16:08 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-29 15:00:42 -0800 |
| commit | 4353f386166d74fd96cb552900fc22f6df211c21 (patch) | |
| tree | c63a81a9581166d6bae9f6d5cecc0db49f08dbf6 /git-merge-recursive.py | |
| parent | d37fd03222ad6b38aa6e237f5f191238c0544850 (diff) | |
| download | git-4353f386166d74fd96cb552900fc22f6df211c21.tar.gz git-4353f386166d74fd96cb552900fc22f6df211c21.tar.xz | |
merge-recursive: Improve the error message printed when merge(1) isn't found.
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 56c3641ab..b17c8e595 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() |