OSDN Git Service

Merge branch 'jt/packmigrate'
authorJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 05:55:09 +0000 (22:55 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 27 Aug 2017 05:55:09 +0000 (22:55 -0700)
Code movement to make it easier to hack later.

* jt/packmigrate: (23 commits)
  pack: move for_each_packed_object()
  pack: move has_pack_index()
  pack: move has_sha1_pack()
  pack: move find_pack_entry() and make it global
  pack: move find_sha1_pack()
  pack: move find_pack_entry_one(), is_pack_valid()
  pack: move check_pack_index_ptr(), nth_packed_object_offset()
  pack: move nth_packed_object_{sha1,oid}
  pack: move clear_delta_base_cache(), packed_object_info(), unpack_entry()
  pack: move unpack_object_header()
  pack: move get_size_from_delta()
  pack: move unpack_object_header_buffer()
  pack: move {,re}prepare_packed_git and approximate_object_count
  pack: move install_packed_git()
  pack: move add_packed_git()
  pack: move unuse_pack()
  pack: move use_pack()
  pack: move pack-closing functions
  pack: move release_pack_memory()
  pack: move open_pack_index(), parse_pack_index()
  ...

1  2 
Makefile
builtin/fetch.c
builtin/fsck.c
builtin/merge.c
builtin/prune-packed.c
cache.h
diff.c
http.c
sha1_file.c

diff --cc Makefile
Simple merge
diff --cc builtin/fetch.c
Simple merge
diff --cc builtin/fsck.c
Simple merge
diff --cc builtin/merge.c
Simple merge
Simple merge
diff --cc cache.h
Simple merge
diff --cc diff.c
Simple merge
diff --cc http.c
Simple merge
diff --cc sha1_file.c
Simple merge