diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-07-06 15:37:42 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-07-06 15:37:42 -0700 |
| commit | 4d9e42f8f11c57b32b976a943c8ddaf6214e64b8 (patch) | |
| tree | f1aee1490288aa30fb62a981696389d9b5e3e992 /pack-write.c | |
| parent | checkout: do not write bogus reflog entry out (diff) | |
| parent | GIT 1.6.0 (diff) | |
| download | tgif-4d9e42f8f11c57b32b976a943c8ddaf6214e64b8.tar.xz | |
Merge commit 'v1.6.0' into jc/checkout-reflog-fix
* commit 'v1.6.0': (2063 commits)
GIT 1.6.0
git-p4: chdir now properly sets PWD environment variable in msysGit
Improve error output of git-rebase
t9300: replace '!' with test_must_fail
Git.pm: Make File::Spec and File::Temp requirement lazy
Documentation: document the pager.* configuration setting
git-stash: improve synopsis in help and manual page
Makefile: building git in cygwin 1.7.0
git-am: ignore --binary option
bash-completion: Add non-command git help files to bash-completion
Fix t3700 on filesystems which do not support question marks in names
Utilise our new p4_read_pipe and p4_write_pipe wrappers
Add p4 read_pipe and write_pipe wrappers
bash completion: Add '--merge' long option for 'git log'
bash completion: Add completion for 'git mergetool'
git format-patch documentation: clarify what --cover-letter does
bash completion: 'git apply' should use 'fix' not 'strip'
t5304-prune: adjust file mtime based on system time rather than file mtime
test-parse-options: use appropriate cast in length_callback
Fix escaping of glob special characters in pathspecs
...
Conflicts:
builtin-checkout.c
Diffstat (limited to 'pack-write.c')
| -rw-r--r-- | pack-write.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/pack-write.c b/pack-write.c index 665e2b29b8..a8f0269936 100644 --- a/pack-write.c +++ b/pack-write.c @@ -2,7 +2,7 @@ #include "pack.h" #include "csum-file.h" -uint32_t pack_idx_default_version = 1; +uint32_t pack_idx_default_version = 2; uint32_t pack_idx_off32_limit = 0x7fffffff; static int sha1_compare(const void *_a, const void *_b) @@ -139,7 +139,7 @@ char *write_idx_file(char *index_name, struct pack_idx_entry **objects, } sha1write(f, sha1, 20); - sha1close(f, NULL, 1); + sha1close(f, NULL, CSUM_FSYNC); SHA1_Final(sha1, &ctx); return index_name; } @@ -183,7 +183,6 @@ void fixup_pack_header_footer(int pack_fd, char *index_pack_lockfile(int ip_out) { - int len, s; char packname[46]; /* @@ -193,11 +192,8 @@ char *index_pack_lockfile(int ip_out) * case, we need it to remove the corresponding .keep file * later on. If we don't get that then tough luck with it. */ - for (len = 0; - len < 46 && (s = xread(ip_out, packname+len, 46-len)) > 0; - len += s); - if (len == 46 && packname[45] == '\n' && - memcmp(packname, "keep\t", 5) == 0) { + if (read_in_full(ip_out, packname, 46) == 46 && packname[45] == '\n' && + memcmp(packname, "keep\t", 5) == 0) { char path[PATH_MAX]; packname[45] = 0; snprintf(path, sizeof(path), "%s/pack/pack-%s.keep", |