projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.
[git.git]
/
git-merge-recursive.py
diff --git
a/git-merge-recursive.py
b/git-merge-recursive.py
index
60e8b21
..
689f914
100755
(executable)
--- a/
git-merge-recursive.py
+++ b/
git-merge-recursive.py
@@
-149,7
+149,10
@@
def mergeTrees(head, merge, common, branch1Name, branch2Name,
else:
updateArg = '-u'
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)
cleanMerge = True
[tree, code] = runProgram('git-write-tree', returnCode=True)
@@
-430,8
+433,11
@@
try:
print ''
except:
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)
if clean:
sys.exit(0)