summaryrefslogtreecommitdiff
path: root/builtin-pack-objects.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-05-30 15:54:46 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-31 21:49:29 (GMT)
commit54352bb2742cfbe53fa820eab53607a46d349ae4 (patch)
tree46cc41aa3259172b9314ad0ca81e5e7e837d1808 /builtin-pack-objects.c
parent4c81b03e30d13dbc93ea7071438ef2da0acd4189 (diff)
downloadgit-54352bb2742cfbe53fa820eab53607a46d349ae4.zip
git-54352bb2742cfbe53fa820eab53607a46d349ae4.tar.gz
git-54352bb2742cfbe53fa820eab53607a46d349ae4.tar.bz2
Remove now unnecessary 'sync()' calls
Since the pack-files are now always created stably on disk, there is no need to sync() before pruning lose objects or old stale pack-files. [jc: with Nico's clean-up] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-pack-objects.c')
-rw-r--r--builtin-pack-objects.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/builtin-pack-objects.c b/builtin-pack-objects.c
index 4c2e0cd..447d492 100644
--- a/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@ -514,9 +514,10 @@ static void write_pack_file(void)
* Did we write the wrong # entries in the header?
* If so, rewrite it like in fast-import
*/
- if (pack_to_stdout || nr_written == nr_remaining) {
- unsigned flags = pack_to_stdout ? CSUM_CLOSE : CSUM_FSYNC;
- sha1close(f, sha1, flags);
+ if (pack_to_stdout) {
+ sha1close(f, sha1, CSUM_CLOSE);
+ } else if (nr_written == nr_remaining) {
+ sha1close(f, sha1, CSUM_FSYNC);
} else {
int fd = sha1close(f, NULL, 0);
fixup_pack_header_footer(fd, sha1, pack_tmp_name, nr_written);