]> git.ipfire.org Git - thirdparty/git.git/commit
Merge branch 'sb/object-store-grafts' into sb/object-store-lookup
authorJunio C Hamano <gitster@pobox.com>
Fri, 29 Jun 2018 17:24:33 +0000 (10:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 29 Jun 2018 17:43:28 +0000 (10:43 -0700)
commitb16b60f71b2354cbad5f2dc16bd5f6cf7d617579
tree8afa4e7dd5c9277fb6a28f9b5e8813ff7aa069fb
parente3331758f12da22f4103eec7efe1b5304a9be5e9
parentb9dbddf6dace2094061d5093743f29c100cfd534
Merge branch 'sb/object-store-grafts' into sb/object-store-lookup

* sb/object-store-grafts:
  commit: allow lookup_commit_graft to handle arbitrary repositories
  commit: allow prepare_commit_graft to handle arbitrary repositories
  shallow: migrate shallow information into the object parser
  path.c: migrate global git_path_* to take a repository argument
  cache: convert get_graft_file to handle arbitrary repositories
  commit: convert read_graft_file to handle arbitrary repositories
  commit: convert register_commit_graft to handle arbitrary repositories
  commit: convert commit_graft_pos() to handle arbitrary repositories
  shallow: add repository argument to is_repository_shallow
  shallow: add repository argument to check_shallow_file_for_update
  shallow: add repository argument to register_shallow
  shallow: add repository argument to set_alternate_shallow_file
  commit: add repository argument to lookup_commit_graft
  commit: add repository argument to prepare_commit_graft
  commit: add repository argument to read_graft_file
  commit: add repository argument to register_commit_graft
  commit: add repository argument to commit_graft_pos
  object: move grafts to object parser
  object-store: move object access functions to object-store.h
72 files changed:
apply.c
archive-tar.c
archive.c
blame.c
branch.c
builtin/blame.c
builtin/cat-file.c
builtin/checkout.c
builtin/clone.c
builtin/commit.c
builtin/describe.c
builtin/difftool.c
builtin/fast-export.c
builtin/fetch.c
builtin/hash-object.c
builtin/log.c
builtin/merge-tree.c
builtin/merge.c
builtin/notes.c
builtin/pack-objects.c
builtin/pull.c
builtin/receive-pack.c
builtin/reflog.c
builtin/remote.c
builtin/replace.c
builtin/reset.c
builtin/rev-parse.c
builtin/tag.c
builtin/unpack-objects.c
bulk-checkin.c
bundle.c
cache-tree.c
cache.h
commit.c
commit.h
config.c
convert.c
diff.c
dir.c
environment.c
fetch-pack.c
fsck.c
git.c
grep.c
list-objects-filter.c
list-objects.c
log-tree.c
merge-recursive.c
notes-merge.c
object-store.h
object.c
object.h
pack-bitmap-write.c
packfile.h
path.c
read-cache.c
ref-filter.c
refs.c
remote-testsvn.c
remote.c
repository.h
rerere.c
revision.c
sequencer.c
shallow.c
submodule-config.c
tree-walk.c
tree.c
unpack-trees.c
upload-pack.c
walker.c
wt-status.c