diff --git a/git-merge-recursive.py b/git-merge-recursive.py
index 60e8b21b3b640868b027ba909a4221a5d1bdbf90..689f91430be5d3ed777f0e371025545450c3ec59 100755 (executable)
--- a/git-merge-recursive.py
+++ b/git-merge-recursive.py
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)
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)