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

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

diff --git a/Makefile b/Makefile
index 31db29d4d1401eeaa7a3c0871db9fe8145532f9b..5a0b3d4a7b7c352f73be60ec254cad768040ee60 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -805,6 +805,7 @@ 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