From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 5 Oct 2010 15:43:59 +0000 (-0700)
Subject: Merge branch 'work/pt/for-junio' of git://repo.or.cz/git/mingw/4msysgit
X-Git-Tag: v1.7.4-rc0~193
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=931c103320e7be6318f3ea107f0701e283b64f35;p=git.git

Merge branch 'work/pt/for-junio' of git://repo.or.cz/git/mingw/4msysgit

* 'work/pt/for-junio' of git://repo.or.cz/git/mingw/4msysgit:
  Add MinGW-specific execv() override.
  Fix Windows-specific macro redefinition warning.
  Fix 'clone' failure at DOS root directory.
  mingw: do not crash on open(NULL, ...)
  git-am: fix detection of absolute paths for windows
  Side-step MSYS-specific path "corruption" leading to t5560 failure.
  Side-step sed line-ending "corruption" leading to t6038 failure.
  Skip 'git archive --remote' test on msysGit
  Do not strip CR when grepping HTTP headers.
  Skip t1300.70 and 71 on msysGit.
  merge-octopus: Work around environment issue on Windows
  MinGW: Report errors when failing to launch the html browser.
  MinGW: fix stat() and lstat() implementations for handling symlinks
  MinGW: Add missing file mode bit defines
  MinGW: Use pid_t more consequently, introduce uid_t for greater compatibility
---

931c103320e7be6318f3ea107f0701e283b64f35