From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 26 May 2009 02:04:29 +0000 (-0700)
Subject: Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maint
X-Git-Tag: v1.6.3.2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2a1feb92ee58770670e6b82992d29cbc5d6f04aa;p=git.git

Merge branch 'js/maint-no-ln-across-libexec-and-bin' into maint

* js/maint-no-ln-across-libexec-and-bin:
  Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile

Conflicts:
	Makefile
---

2a1feb92ee58770670e6b82992d29cbc5d6f04aa
diff --cc Makefile
index 26d180cc5,2b8ce48c0..d21b4eb54
--- a/Makefile
+++ b/Makefile
@@@ -168,13 -160,8 +168,16 @@@ all:
  # your external grep (e.g., if your system lacks grep, if its grep is
  # broken, or spawning external process is slower than built-in grep git has).
  #
 +# Define UNRELIABLE_FSTAT if your system's fstat does not return the same
 +# information on a not yet closed file that lstat would return for the same
 +# file after it was closed.
 +#
 +# Define OBJECT_CREATION_USES_RENAMES if your operating systems has problems
 +# when hardlinking a file to another name and unlinking the original file right
 +# away (some NTFS drivers seem to zero the contents in that scenario).
++#
+ # Define NO_CROSS_DIRECTORY_HARDLINKS if you plan to distribute the installed
+ # programs as a tar, where bin/ and libexec/ might be on different file systems.
  
  GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN