From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 Aug 2008 23:23:54 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~300
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/bb34ca5c5f7df33ea84a5b71621dbdeac1da39c1?hp=cdc7e388da47b66fe11c92ed7698ec233ce70635

Merge branch 'maint'

* maint:
ctype.c: protect tiny C preprocessor constants
index-pack: be careful after fixing up the header/footer
---

diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 2dadec1630..d394c494a5 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -499,7 +499,6 @@ static void write_pack_file(void)
 		} else {
 			int fd = sha1close(f, NULL, 0);
 			fixup_pack_header_footer(fd, sha1, pack_tmp_name, nr_written);
-			fsync_or_die(fd, pack_tmp_name);
 			close(fd);
 		}
 
diff --git a/ctype.c b/ctype.c
index ee06eb7f48..d2bd38e901 100644
--- a/ctype.c
+++ b/ctype.c
@@ -5,6 +5,11 @@
  */
 #include "cache.h"
 
+/* Just so that no insane platform contaminate namespace with these symbols */
+#undef SS
+#undef AA
+#undef DD
+
 #define SS GIT_SPACE
 #define AA GIT_ALPHA
 #define DD GIT_DIGIT
diff --git a/pack-write.c b/pack-write.c
index a8f0269936..ddcfd37af2 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -179,6 +179,7 @@ void fixup_pack_header_footer(int pack_fd,
 
 	SHA1_Final(pack_file_sha1, &c);
 	write_or_die(pack_fd, pack_file_sha1, 20);
+	fsync_or_die(pack_fd, pack_name);
 }
 
 char *index_pack_lockfile(int ip_out)