From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 3 Dec 2009 21:53:54 +0000 (-0800)
Subject: Merge branch 'rj/maint-cygwin-count-objects' into maint
X-Git-Tag: v1.6.5.5~12
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/af742b9b27c3e3caac9b304c76db323e2334b955?ds=inline;hp=-c

Merge branch 'rj/maint-cygwin-count-objects' into maint

* rj/maint-cygwin-count-objects:
git-count-objects: Fix a disk-space under-estimate on Cygwin
---

af742b9b27c3e3caac9b304c76db323e2334b955
diff --combined Makefile
index bbd4a8f580,79195c875b..9b94e967e6
--- a/Makefile
+++ b/Makefile
@@@ -159,10 -159,6 +159,10 @@@ all:
  # Define ASCIIDOC_NO_ROFF if your DocBook XSL escapes raw roff directives
  # (versions 1.72 and later and 1.68.1 and earlier).
  #
 +# Define GNU_ROFF if your target system uses GNU groff.  This forces
 +# apostrophes to be ASCII so that cut&pasting examples to the shell
 +# will work.
 +#
  # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
  # MakeMaker (e.g. using ActiveState under Cygwin).
  #
@@@ -416,7 -412,6 +416,7 @@@ LIB_H += builtin.
  LIB_H += cache.h
  LIB_H += cache-tree.h
  LIB_H += commit.h
 +LIB_H += compat/bswap.h
  LIB_H += compat/cygwin.h
  LIB_H += compat/mingw.h
  LIB_H += csum-file.h
@@@ -781,14 -776,13 +781,15 @@@ ifeq ($(uname_O),Cygwin
  	NO_FAST_WORKING_DIRECTORY = UnfortunatelyYes
  	NO_TRUSTABLE_FILEMODE = UnfortunatelyYes
  	OLD_ICONV = UnfortunatelyYes
+ 	NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
  	# There are conflicting reports about this.
  	# On some boxes NO_MMAP is needed, and not so elsewhere.
  	# Try commenting this out if you suspect MMAP is more efficient
  	NO_MMAP = YesPlease
  	NO_IPV6 = YesPlease
  	X = .exe
 +	COMPAT_OBJS += compat/cygwin.o
 +	UNRELIABLE_FSTAT = UnfortunatelyYes
  endif
  ifeq ($(uname_S),FreeBSD)
  	NEEDS_LIBICONV = YesPlease
@@@ -898,6 -892,10 +899,6 @@@ ifeq ($(uname_S),HP-UX
  	NO_SYS_SELECT_H = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  endif
 -ifneq (,$(findstring CYGWIN,$(uname_S)))
 -	COMPAT_OBJS += compat/cygwin.o
 -	UNRELIABLE_FSTAT = UnfortunatelyYes
 -endif
  ifdef MSVC
  	GIT_VERSION := $(GIT_VERSION).MSVC
  	pathsep = ;
@@@ -1378,7 -1376,7 +1379,7 @@@ SHELL = $(SHELL_PATH
  
  all:: shell_compatibility_test $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS
  ifneq (,$X)
 -	$(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$p' -ef '$p$X' || $(RM) '$p';)
 +	$(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test -d '$p' -o '$p' -ef '$p$X' || $(RM) '$p';)
  endif
  
  all::
@@@ -1629,7 -1627,6 +1630,7 @@@ GIT-CFLAGS: .FORCE-GIT-CFLAG
  # and the first level quoting from the shell that runs "echo".
  GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
  	@echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@
 +	@echo PERL_PATH=\''$(subst ','\'',$(PERL_PATH_SQ))'\' >>$@
  	@echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@
  	@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
  	@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
@@@ -1803,10 -1800,7 +1804,10 @@@ dist: git.spec git-archive$(X) configur
  	gzip -f -9 $(GIT_TARNAME).tar
  
  rpm: dist
 -	$(RPMBUILD) -ta $(GIT_TARNAME).tar.gz
 +	$(RPMBUILD) \
 +		--define "_source_filedigest_algorithm md5" \
 +		--define "_binary_filedigest_algorithm md5" \
 +		-ta $(GIT_TARNAME).tar.gz
  
  htmldocs = git-htmldocs-$(GIT_VERSION)
  manpages = git-manpages-$(GIT_VERSION)
@@@ -1834,7 -1828,7 +1835,7 @@@ distclean: clea
  	$(RM) configure
  
  clean:
 -	$(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o \
 +	$(RM) *.o block-sha1/*.o arm/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o \
  		$(LIB_FILE) $(XDIFF_LIB)
  	$(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
  	$(RM) $(TEST_PROGRAMS)