summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2013-04-16 15:46:22 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-16 15:02:46 -0700
commitc19a490e37181de8fa94ae1074af4b9f9a518f95 (patch)
tree59751aaee7a5596494254f542cd8890135f44474 /Documentation/git-merge.txt
parentfast-export: fix argument name in error messages (diff)
downloadtgif-c19a490e37181de8fa94ae1074af4b9f9a518f95.tar.xz
usage: allow pluggable die-recursion checks
When any git code calls die or die_errno, we use a counter to detect recursion into the die functions from any of the helper functions. However, such a simple counter is not good enough for threaded programs, which may call die from a sub-thread, killing only the sub-thread (but incrementing the counter for everyone). Rather than try to deal with threads ourselves here, let's just allow callers to plug in their own recursion-detection function. This is similar to how we handle the die routine (the caller plugs in a die routine which may kill only the sub-thread). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions