From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 24 Nov 2009 23:42:55 +0000 (-0800)
Subject: Merge branch 'rj/maint-cygwin-count-objects'
X-Git-Tag: v1.6.6-rc1~31
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ba2c7476882ea56fcad298ef195b538ed7a7ad32?ds=inline;hp=-c

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

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

ba2c7476882ea56fcad298ef195b538ed7a7ad32
diff --combined Makefile
index 31db29d4d1,79195c875b..5a0b3d4a7b
--- 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).
  #
@@@ -204,18 -200,6 +204,18 @@@
  # memory allocators with the nedmalloc allocator written by Niall Douglas.
  #
  # Define NO_REGEX if you have no or inferior regex support in your C library.
 +#
 +# Define DEFAULT_PAGER to a sensible pager command (defaults to "less") if
 +# you want to use something different.  The value will be interpreted by the
 +# shell at runtime when it is used.
 +#
 +# Define DEFAULT_EDITOR to a sensible editor command (defaults to "vi") if you
 +# want to use something different.  The value will be interpreted by the shell
 +# if necessary when it is used.  Examples:
 +#
 +#   DEFAULT_EDITOR='~/bin/vi',
 +#   DEFAULT_EDITOR='$GIT_FALLBACK_EDITOR',
 +#   DEFAULT_EDITOR='"C:\Program Files\Vim\gvim.exe" --nofork'
  
  GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
  	@$(SHELL_PATH) ./GIT-VERSION-GEN
@@@ -228,12 -212,6 +228,12 @@@ uname_R := $(shell sh -c 'uname -r 2>/d
  uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not')
  uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not')
  
 +ifdef MSVC
 +	# avoid the MingW and Cygwin configuration sections
 +	uname_S := Windows
 +	uname_O := Windows
 +endif
 +
  # CFLAGS and LDFLAGS are for the users to override from the command line.
  
  CFLAGS = -g -O2 -Wall
@@@ -343,7 -321,6 +343,7 @@@ SCRIPT_SH += git-merge-one-file.s
  SCRIPT_SH += git-merge-resolve.sh
  SCRIPT_SH += git-mergetool.sh
  SCRIPT_SH += git-mergetool--lib.sh
 +SCRIPT_SH += git-notes.sh
  SCRIPT_SH += git-parse-remote.sh
  SCRIPT_SH += git-pull.sh
  SCRIPT_SH += git-quiltimport.sh
@@@ -377,7 -354,6 +377,7 @@@ EXTRA_PROGRAMS 
  PROGRAMS += $(EXTRA_PROGRAMS)
  PROGRAMS += git-fast-import$X
  PROGRAMS += git-hash-object$X
 +PROGRAMS += git-imap-send$X
  PROGRAMS += git-index-pack$X
  PROGRAMS += git-merge-index$X
  PROGRAMS += git-merge-tree$X
@@@ -389,7 -365,6 +389,7 @@@ PROGRAMS += git-show-index$
  PROGRAMS += git-unpack-file$X
  PROGRAMS += git-upload-pack$X
  PROGRAMS += git-var$X
 +PROGRAMS += git-http-backend$X
  
  # List built-in command $C whose implementation cmd_$C() is not in
  # builtin-$C.o but is linked in as part of some other command.
@@@ -437,7 -412,6 +437,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
@@@ -458,7 -432,6 +458,7 @@@ LIB_H += ll-merge.
  LIB_H += log-tree.h
  LIB_H += mailmap.h
  LIB_H += merge-recursive.h
 +LIB_H += notes.h
  LIB_H += object.h
  LIB_H += pack.h
  LIB_H += pack-refs.h
@@@ -479,7 -452,6 +479,7 @@@ LIB_H += sideband.
  LIB_H += sigchain.h
  LIB_H += strbuf.h
  LIB_H += string-list.h
 +LIB_H += submodule.h
  LIB_H += tag.h
  LIB_H += transport.h
  LIB_H += tree.h
@@@ -544,7 -516,6 +544,7 @@@ LIB_OBJS += match-trees.
  LIB_OBJS += merge-file.o
  LIB_OBJS += merge-recursive.o
  LIB_OBJS += name-hash.o
 +LIB_OBJS += notes.o
  LIB_OBJS += object.o
  LIB_OBJS += pack-check.o
  LIB_OBJS += pack-refs.o
@@@ -579,7 -550,6 +579,7 @@@ LIB_OBJS += sideband.
  LIB_OBJS += sigchain.o
  LIB_OBJS += strbuf.o
  LIB_OBJS += string-list.o
 +LIB_OBJS += submodule.o
  LIB_OBJS += symlinks.o
  LIB_OBJS += tag.o
  LIB_OBJS += trace.o
@@@ -624,6 -594,7 +624,6 @@@ BUILTIN_OBJS += builtin-diff-index.
  BUILTIN_OBJS += builtin-diff-tree.o
  BUILTIN_OBJS += builtin-diff.o
  BUILTIN_OBJS += builtin-fast-export.o
 -BUILTIN_OBJS += builtin-fetch--tool.o
  BUILTIN_OBJS += builtin-fetch-pack.o
  BUILTIN_OBJS += builtin-fetch.o
  BUILTIN_OBJS += builtin-fmt-merge-msg.o
@@@ -805,14 -776,13 +805,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
@@@ -922,11 -892,15 +923,11 @@@ 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
 +ifeq ($(uname_S),Windows)
  	GIT_VERSION := $(GIT_VERSION).MSVC
  	pathsep = ;
  	NO_PREAD = YesPlease
 -	NO_OPENSSL = YesPlease
 +	NEEDS_CRYPTO_WITH_SSL = YesPlease
  	NO_LIBGEN_H = YesPlease
  	NO_SYMLINK_HEAD = YesPlease
  	NO_IPV6 = YesPlease
@@@ -956,7 -930,6 +957,7 @@@
  	NO_REGEX = YesPlease
  	NO_CURL = YesPlease
  	NO_PTHREADS = YesPlease
 +	BLK_SHA1 = YesPlease
  
  	CC = compat/vcbuild/scripts/clink.pl
  	AR = compat/vcbuild/scripts/lib.pl
@@@ -975,13 -948,14 +976,13 @@@ els
  	BASIC_CFLAGS += -Zi -MTd
  endif
  	X = .exe
 -else
 +endif
  ifneq (,$(findstring MINGW,$(uname_S)))
  	pathsep = ;
  	NO_PREAD = YesPlease
 -	NO_OPENSSL = YesPlease
 +	NEEDS_CRYPTO_WITH_SSL = YesPlease
  	NO_LIBGEN_H = YesPlease
  	NO_SYMLINK_HEAD = YesPlease
 -	NO_IPV6 = YesPlease
  	NO_SETENV = YesPlease
  	NO_UNSETENV = YesPlease
  	NO_STRCASESTR = YesPlease
@@@ -1005,7 -979,6 +1006,7 @@@
  	UNRELIABLE_FSTAT = UnfortunatelyYes
  	OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
  	NO_REGEX = YesPlease
 +	BLK_SHA1 = YesPlease
  	COMPAT_CFLAGS += -D__USE_MINGW_ACCESS -DNOGDI -Icompat -Icompat/fnmatch
  	COMPAT_CFLAGS += -DSTRIP_EXTENSION=\".exe\"
  	COMPAT_OBJS += compat/mingw.o compat/fnmatch/fnmatch.o compat/winansi.o
@@@ -1024,6 -997,7 +1025,6 @@@ els
  	NO_PTHREADS = YesPlease
  endif
  endif
 -endif
  
  -include config.mak.autogen
  -include config.mak
@@@ -1102,6 -1076,7 +1103,6 @@@ EXTLIBS += -l
  
  ifndef NO_POSIX_ONLY_PROGRAMS
  	PROGRAMS += git-daemon$X
 -	PROGRAMS += git-imap-send$X
  endif
  ifndef NO_OPENSSL
  	OPENSSL_LIBSSL = -lssl
@@@ -1389,22 -1364,6 +1390,22 @@@ BASIC_CFLAGS += -DSHA1_HEADER='$(SHA1_H
  	$(COMPAT_CFLAGS)
  LIB_OBJS += $(COMPAT_OBJS)
  
 +# Quote for C
 +
 +ifdef DEFAULT_EDITOR
 +DEFAULT_EDITOR_CQ = "$(subst ",\",$(subst \,\\,$(DEFAULT_EDITOR)))"
 +DEFAULT_EDITOR_CQ_SQ = $(subst ','\'',$(DEFAULT_EDITOR_CQ))
 +
 +BASIC_CFLAGS += -DDEFAULT_EDITOR='$(DEFAULT_EDITOR_CQ_SQ)'
 +endif
 +
 +ifdef DEFAULT_PAGER
 +DEFAULT_PAGER_CQ = "$(subst ",\",$(subst \,\\,$(DEFAULT_PAGER)))"
 +DEFAULT_PAGER_CQ_SQ = $(subst ','\'',$(DEFAULT_PAGER_CQ))
 +
 +BASIC_CFLAGS += -DDEFAULT_PAGER='$(DEFAULT_PAGER_CQ_SQ)'
 +endif
 +
  ALL_CFLAGS += $(BASIC_CFLAGS)
  ALL_LDFLAGS += $(BASIC_LDFLAGS)
  
@@@ -1417,7 -1376,7 +1418,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::
@@@ -1668,7 -1627,6 +1669,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)))'\' >>$@
@@@ -1842,10 -1800,7 +1843,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)
@@@ -1873,7 -1828,7 +1874,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)