From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 May 2009 08:43:08 +0000 (-0700)
Subject: Merge branch 'js/maint-no-ln-across-libexec-and-bin'
X-Git-Tag: v1.6.4-rc0~133
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2c8f8b19d4f293edd78885880ed1a6166395ffdd;p=git.git

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

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

Conflicts:
	Makefile
---

2c8f8b19d4f293edd78885880ed1a6166395ffdd
diff --cc Makefile
index 3ef9230f7,2b8ce48c0..fdb39fa43
--- 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