git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f241ff0)
merge_recursive: abort properly upon errors
authorJohannes Schindelin <redacted>
Tue, 26 Jul 2016 16:06:07 +0000 (18:06 +0200)
committerJunio C Hamano <redacted>
Tue, 26 Jul 2016 18:13:44 +0000 (11:13 -0700)
commitde8946de1694a8cf311daab7b2c416d76cb04d23
treefbbf206cf8f8a9db5aec9cad8c28a2908fe271e1tree | snapshot
parentf241ff0d0a9ddb84b2f673a1b7a92fea0d6add3acommit | diff
merge_recursive: abort properly upon errors

There are a couple of places where return values never indicated errors
before, as we simply died instead of returning.

But now negative return values mean that there was an error and we have to
abort the operation. Let's do exactly that.

Signed-off-by: Johannes Schindelin <redacted>
Signed-off-by: Junio C Hamano <redacted>
merge-recursive.c diff | blob | history
git clone https://git.99rst.org/PROJECT