summaryrefslogtreecommitdiff
path: root/git-difftool--helper.sh
diff options
context:
space:
mode:
authorLibravatar Christian Couder <christian.couder@gmail.com>2016-08-08 23:03:20 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-08-11 12:41:47 -0700
commit8f5b5445d7c015dc5f2bbf65d23779d355c0c36e (patch)
tree686900c4155ebe34050c8303cf488b396a297fde /git-difftool--helper.sh
parentbuiltin/apply: make add_index_file() return -1 on error (diff)
downloadtgif-8f5b5445d7c015dc5f2bbf65d23779d355c0c36e.tar.xz
builtin/apply: make create_file() return -1 on error
To libify `git apply` functionality we have to signal errors to the caller instead of exit()ing. To do that in a compatible manner with the rest of the error handling in "builtin/apply.c", create_file() should just return what add_conflicted_stages_file() and add_index_file() are returning instead of calling exit(). Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-difftool--helper.sh')
0 files changed, 0 insertions, 0 deletions