undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

merge-recursive: Improve the error message printed when merge(1) isn't found.

Browse Source 
Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Fredrik Kuivinen 2006-01-29 13:16:08 +01:00 committed by Junio C Hamano
parent d37fd03222
commit 4353f38616
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
git-merge-recursive.py
View File

@ -205,11 +205,16 @@ def mergeFile(oPath, oSha, oMode, aPath, aSha, aMode, bPath, bSha, bMode,
orig = runProgram(['git-unpack-file', oSha]).rstrip() orig = runProgram(['git-unpack-file', oSha]).rstrip()
src1 = runProgram(['git-unpack-file', aSha]).rstrip() src1 = runProgram(['git-unpack-file', aSha]).rstrip()
src2 = runProgram(['git-unpack-file', bSha]).rstrip() src2 = runProgram(['git-unpack-file', bSha]).rstrip()
try:
[out, code] = runProgram(['merge', [out, code] = runProgram(['merge',
'-L', branch1Name + '/' + aPath, '-L', branch1Name + '/' + aPath,
'-L', 'orig/' + oPath, '-L', 'orig/' + oPath,
'-L', branch2Name + '/' + bPath, '-L', branch2Name + '/' + bPath,
src1, orig, src2], returnCode=True) 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', sha = runProgram(['git-hash-object', '-t', 'blob', '-w',
src1]).rstrip() src1]).rstrip()