]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'tb/pack-finalize-ordering'
authorJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 22:20:42 +0000 (15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 20 Sep 2021 22:20:42 +0000 (15:20 -0700)
The order in which various files that make up a single (conceptual)
packfile has been reevaluated and straightened up.  This matters in
correctness, as an incomplete set of files must not be shown to a
running Git.

* tb/pack-finalize-ordering:
  pack-objects: rename .idx files into place after .bitmap files
  pack-write: split up finish_tmp_packfile() function
  builtin/index-pack.c: move `.idx` files into place last
  index-pack: refactor renaming in final()
  builtin/repack.c: move `.idx` files into place last
  pack-write.c: rename `.idx` files after `*.rev`
  pack-write: refactor renaming in finish_tmp_packfile()
  bulk-checkin.c: store checksum directly
  pack.h: line-wrap the definition of finish_tmp_packfile()

1  2 
builtin/index-pack.c
builtin/pack-objects.c
builtin/repack.c
pack-write.c

Simple merge
Simple merge
Simple merge
diff --cc pack-write.c
Simple merge