index-pack: be careful after fixing up the header/footer
The index-pack command, when processing a thin pack, fixed up the pack after-the-fact. It forgets to fsync the result, because it only did that in one path rather in all cases of fixup. This moves the fsync_or_die() to the fix-up routine itself, rather than doing it in one of the callers, so that all cases are covered. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
d0b92a3f6e
commit
0c68d386da
@ -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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -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)
|
||||||
|
Reference in New Issue
Block a user