undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Fredrik Kuivinen 2005-09-25 16:48:24 +02:00 committed by Junio C Hamano
parent 946f5f7c24
commit 0bed18998a
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-merge-recursive.py
View File

@ -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)