projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 946f5f7) | patch
[PATCH] recursive-merge: Don't print a stack trace when read-tree fails.
authorFredrik Kuivinen <freku045@student.liu.se>
Sun, 25 Sep 2005 14:48:24 +0000 (16:48 +0200)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Sep 2005 23:08:53 +0000 (16:08 -0700)
commit0bed18998ae6c0cec1485e6295be16a4fcebc7a7
tree976e661a6944005201b73ec14424a69fbeaff3d2tree | snapshot
parent946f5f7c245a0f9398417be5946795cfebfd1c62commit | diff
[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>
git-merge-recursive.py diff | blob | history
The core git plumbing