tree b5ed4a96ce170574b07ea9178ad90b44afe09ef7
parent 40a9c3c9a0328f9b11b1fe5980888d509f26be4f
parent 1ece66bc9e5433dff008786daba9918f3e2a6525
author Junio C Hamano <gitster@pobox.com> 1367000759 -0700
committer Junio C Hamano <gitster@pobox.com> 1367000759 -0700

Merge branch 'jk/a-thread-only-dies-once' into maint

* jk/a-thread-only-dies-once:
  run-command: use thread-aware die_is_recursing routine
  usage: allow pluggable die-recursion checks