summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Christian Couder <christian.couder@gmail.com>2016-08-08 23:03:06 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-11 12:41:47 -0700
commitf95fdc256b4732e6363823daa707ea6058e6db8e (patch)
tree8c96ca7d9f8e51b8437e9b4b458ce737ff8033c1 /builtin/merge.c
parentbuiltin/apply: make parse_whitespace_option() return -1 instead of die()ing (diff)
downloadtgif-f95fdc256b4732e6363823daa707ea6058e6db8e.tar.xz
builtin/apply: make parse_ignorewhitespace_option() return -1 instead of die()ing
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", parse_ignorewhitespace_option() should return -1 instead of calling die(). Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions