@matheusbsbs / matheus-bagliano / commits / 0bed18998a
Fork 0

[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.

If the working tree is dirty read-tree will fail, and we don't want an ugly stack trace in that case. Also make sure we don't print stack traces when we use 'die'. Signed-off-by: Fredrik Kuivinen <freku045@student.liu.se> Signed-off-by: Junio C Hamano <junkio@cox.net>

Fredrik Kuivinen committed Sep 25, 2005 at 16:48 UTC 0bed18998ae6c0cec1485e6295be16a4fcebc7a7
1 file changed +9 -3
git-merge-recursive.py
+9 -3
@@ -149,7 +149,10 @@ def mergeTrees(head, merge, common, branch1Name, branch2Name,
149 else:
150 updateArg = '-u'
151
152 - runProgram(['git-read-tree', updateArg, '-m', common, head, merge])
152 + [out, code] = runProgram(['git-read-tree', updateArg, '-m', common, head, merge], returnCode = True)
153 + if code != 0:
154 + die('git-read-tree:', out)
155 +
156 cleanMerge = True
157
158 [tree, code] = runProgram('git-write-tree', returnCode=True)
@@ -430,8 +433,11 @@ try:
433
434 print ''
435 except:
433 - traceback.print_exc(None, sys.stderr)
434 - sys.exit(2)
436 + if isinstance(sys.exc_info()[1], SystemExit):
437 + raise
438 + else:
439 + traceback.print_exc(None, sys.stderr)
440 + sys.exit(2)
441
442 if clean:
443 sys.exit(0)