From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 25 Nov 2007 00:31:25 +0000 (-0800)
Subject: Merge branch 'js/mingw-fallouts'
X-Git-Tag: v1.5.4-rc0~154
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ab002e34e26c39a716dc80359450f739ba907122;p=git.git

Merge branch 'js/mingw-fallouts'

* js/mingw-fallouts:
  fetch-pack: Prepare for a side-band demultiplexer in a thread.
  rehabilitate some t5302 tests on 32-bit off_t machines
  Allow ETC_GITCONFIG to be a relative path.
  Introduce git_etc_gitconfig() that encapsulates access of ETC_GITCONFIG.
  Allow a relative builtin template directory.
  Close files opened by lock_file() before unlinking.
  builtin run_command: do not exit with -1.
  Move #include <sys/select.h> and <sys/ioctl.h> to git-compat-util.h.
  Use is_absolute_path() in sha1_file.c.
  Skip t3902-quoted.sh if the file system does not support funny names.
  t5302-pack-index: Skip tests of 64-bit offsets if necessary.
  t7501-commit.sh: Not all seds understand option -i
  t5300-pack-object.sh: Split the big verify-pack test into smaller parts.
---

ab002e34e26c39a716dc80359450f739ba907122
diff --cc t/t7501-commit.sh
index 9dba104b1,31a6f6339..31a6f6339
mode 100755,100644..100755
--- a/t/t7501-commit.sh
+++ b/t/t7501-commit.sh