| commit | de8946de1694a8cf311daab7b2c416d76cb04d23 | |
| author | Johannes Schindelin <johannes.schindelin@gmx.de> | |
| Tue, 26 Jul 2016 16:06:07 +0000 (26 18:06 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 26 Jul 2016 18:13:44 +0000 (26 11:13 -0700) | ||
| tree | fbbf206cf8f8a9db5aec9cad8c28a2908fe271e1 | treesnapshot (tar.gz zip) |
| parent | f241ff0d0a9ddb84b2f673a1b7a92fea0d6add3a | commitdiff |
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| merge-recursive.c | diffblobblamehistory |