| commit | a902edceebd0a25a307163f050326bda8f494204 | |
| author | Christian Couder <christian.couder@gmail.com> | |
| Mon, 8 Aug 2016 21:03:18 +0000 (8 23:03 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Aug 2016 19:41:47 +0000 (11 12:41 -0700) | ||
| tree | 8769abd10e4cc3e0d8cf9605c6976771be1c6c52 | treesnapshot (tar.gz zip) |
| parent | 6e8df314692105e7d3e69f548440e4b817bf3211 | commitdiff |
builtin/apply: make add_conflicted_stages_file() return -1 on error
To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.
To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", add_conflicted_stages_file() should return -1
instead of calling die().
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
To libify `git apply` functionality we have to signal errors to the
caller instead of die()ing.
To do that in a compatible manner with the rest of the error handling
in "builtin/apply.c", add_conflicted_stages_file() should return -1
instead of calling die().
Helped-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/apply.c | diffblobblamehistory |