X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-merge-recursive.py;h=689f91430be5d3ed777f0e371025545450c3ec59;hb=a23cd8ece70262fac2a80ef3e454c1cf1c63605a;hp=60e8b21b3b640868b027ba909a4221a5d1bdbf90;hpb=4803c2802c11525b11d106247661ea13b2a9ce98;p=git.git

diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 60e8b21b3..689f91430 100755
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
@@ -149,7 +149,10 @@ def mergeTrees(head, merge, common, branch1Name, branch2Name,
     else:
         updateArg = '-u'
 
-    runProgram(['git-read-tree', updateArg, '-m', common, head, merge])
+    [out, code] = runProgram(['git-read-tree', updateArg, '-m', common, head, merge], returnCode = True)
+    if code != 0:
+        die('git-read-tree:', out)
+
     cleanMerge = True
 
     [tree, code] = runProgram('git-write-tree', returnCode=True)
@@ -430,8 +433,11 @@ try:
 
     print ''
 except:
-    traceback.print_exc(None, sys.stderr)
-    sys.exit(2)
+    if isinstance(sys.exc_info()[1], SystemExit):
+        raise
+    else:
+        traceback.print_exc(None, sys.stderr)
+        sys.exit(2)
 
 if clean:
     sys.exit(0)