[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>

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
@@ -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 @@ def usage():
 
     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)