git/git-compat-util.h, branch v1.8.2.2

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

2013-04-26T18:25:59Z

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

usage: allow pluggable die-recursion checks

2013-04-16T22:02:46Z

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 Signed-off-by: Junio C Hamano

Merge branch 'maint-1.8.1' into maint

2013-03-25T20:46:42Z

* maint-1.8.1: bundle: Add colons to list headings in "verify" bundle: Fix "verify" output if history is complete Documentation: filter-branch env-filter example git-filter-branch.txt: clarify ident variables usage git-compat-util.h: Provide missing netdb.h definitions describe: Document --match pattern format Documentation/githooks: Explain pre-rebase parameters update-index: list supported idx versions and their features diff-options: unconfuse description of --color read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr() index-format.txt: mention of v4 is missing in some places

Merge branch 'dm/ni-maxhost-may-be-missing' into maint-1.8.1

2013-03-25T20:45:42Z

Some sources failed to compile on systems that lack NI_MAXHOST in their system header. * dm/ni-maxhost-may-be-missing: git-compat-util.h: Provide missing netdb.h definitions

Revert "compat: add strtok_r()"

2013-02-26T17:16:58Z

This reverts commit 78457bc0ccc1af8b9eb776a0b17986ebd50442bc. commit 28c5d9e ("vcs-svn: drop string_pool") previously removed the only call-site for strtok_r. So let's get rid of the compat implementation as well. Signed-off-by: Erik Faye-Lund Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

git-compat-util.h: Provide missing netdb.h definitions

2013-02-25T20:16:08Z

Some platforms may lack the NI_MAXHOST and NI_MAXSERV values in their system headers, so ensure they are available. Signed-off-by: David Michael Signed-off-by: Junio C Hamano

Merge branch 'jk/error-const-return'

2013-02-14T18:29:23Z

* jk/error-const-return: Use __VA_ARGS__ for all of error's arguments

Use __VA_ARGS__ for all of error's arguments

2013-02-08T16:22:28Z

QNX 6.3.2 uses GCC 2.95.3 by default, and GCC 2.95.3 doesn't remove the comma if the error macro's variable argument is left out. Instead of testing for a sufficiently recent version of GCC, make __VA_ARGS__ match all of the arguments. Signed-off-by: Matt Kraai Acked-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'nd/retire-fnmatch'

2013-01-25T20:34:55Z

Replace our use of fnmatch(3) with a more feature-rich wildmatch. A handful patches at the bottom have been moved to nd/wildmatch to graduate as part of that branch, before this series solidifies. We may want to mark USE_WILDMATCH as an experimental curiosity a bit more clearly (i.e. should not be enabled in production environment, because it will make the behaviour between builds unpredictable). * nd/retire-fnmatch: Makefile: add USE_WILDMATCH to use wildmatch as fnmatch wildmatch: advance faster in + patterns wildmatch: make a special case for "*/" with FNM_PATHNAME test-wildmatch: add "perf" command to compare wildmatch and fnmatch wildmatch: support "no FNM_PATHNAME" mode wildmatch: make dowild() take arbitrary flags wildmatch: rename constants and update prototype

Merge branch 'jk/suppress-clang-warning'

2013-01-24T05:19:00Z

* jk/suppress-clang-warning: fix clang -Wunused-value warnings for error functions