From 0bed18998ae6c0cec1485e6295be16a4fcebc7a7 Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Sun, 25 Sep 2005 16:48:24 +0200 Subject: [PATCH] [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 Signed-off-by: Junio C Hamano --- git-merge-recursive.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/git-merge-recursive.py b/git-merge-recursive.py index 60e8b21b..689f9143 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) -- 2.11.0