Remove now unnecessary 'sync()' calls

torvalds · gitster · commit 54352bb2742c · 2008-05-31T14:49:29.000-07:00
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 &lt;torvalds@linux-foundation.org&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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);
diff --git a/builtin-prune-packed.c b/builtin-prune-packed.c
@@ -85,7 +85,6 @@ int cmd_prune_packed(int argc, const char **argv, const char *prefix)
 		/* Handle arguments here .. */
 		usage(prune_packed_usage);
 	}
-	sync();
 	prune_packed_objects(opts);
 	return 0;
 }
diff --git a/builtin-prune.c b/builtin-prune.c
@@ -156,7 +156,6 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
 	mark_reachable_objects(&revs, 1);
 	prune_object_dir(get_object_directory());
 
-	sync();
 	prune_packed_objects(show_only);
 	remove_temporary_files();
 	return 0;
diff --git a/git-repack.sh b/git-repack.sh
@@ -125,7 +125,6 @@ then
 	# We know $existing are all redundant.
 	if [ -n "$existing" ]
 	then
-		sync
 		( cd "$PACKDIR" &&
 		  for e in $existing
 		  do

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,6 @@ int cmd_prune_packed(int argc, const char *argv, const char prefix)`
`85`	`85`	`/* Handle arguments here .. */`
`86`	`86`	`usage(prune_packed_usage);`
`87`	`87`	`}`
`88`		`- sync();`
`89`	`88`	`prune_packed_objects(opts);`
`90`	`89`	`return 0;`
`91`	`90`	`}`