OSDN Git Service

Merge branch 'eb/no-pthreads'
authorJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 21:59:10 +0000 (14:59 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 24 Oct 2014 21:59:10 +0000 (14:59 -0700)
Allow us build with NO_PTHREADS=NoThanks compilation option.

* eb/no-pthreads:
  Handle atexit list internaly for unthreaded builds
  pack-objects: set number of threads before checking and warning
  index-pack: fix compilation with NO_PTHREADS

1  2 
builtin/clone.c
builtin/pack-objects.c
git-compat-util.h
run-command.c
shallow.c

diff --cc builtin/clone.c
Simple merge
Simple merge
Simple merge
diff --cc run-command.c
Simple merge
diff --cc shallow.c
Simple merge