undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  ctype.c: protect tiny C preprocessor constants
  index-pack: be careful after fixing up the header/footer
This commit is contained in:
Junio C Hamano 2008-08-27 16:23:54 -07:00
commit bb34ca5c5f
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin-pack-objects.c
View File

@ -499,7 +499,6 @@ static void write_pack_file(void)
} else { } else {
int fd = sha1close(f, NULL, 0); int fd = sha1close(f, NULL, 0);
fixup_pack_header_footer(fd, sha1, pack_tmp_name, nr_written); fixup_pack_header_footer(fd, sha1, pack_tmp_name, nr_written);
fsync_or_die(fd, pack_tmp_name);
close(fd); close(fd);
} }

5
ctype.c
View File

@ -5,6 +5,11 @@
*/ */
#include "cache.h" #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 SS GIT_SPACE
#define AA GIT_ALPHA #define AA GIT_ALPHA
#define DD GIT_DIGIT #define DD GIT_DIGIT

1
pack-write.c
View File

@ -179,6 +179,7 @@ void fixup_pack_header_footer(int pack_fd,
SHA1_Final(pack_file_sha1, &c); SHA1_Final(pack_file_sha1, &c);
write_or_die(pack_fd, pack_file_sha1, 20); write_or_die(pack_fd, pack_file_sha1, 20);
fsync_or_die(pack_fd, pack_name);
} }
char *index_pack_lockfile(int ip_out) char *index_pack_lockfile(int ip_out)