diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-06-29 17:24:33 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-29 17:43:28 (GMT) |
| commit | b16b60f71b2354cbad5f2dc16bd5f6cf7d617579 (patch) | |
| tree | 8afa4e7dd5c9277fb6a28f9b5e8813ff7aa069fb /commit.h | |
| parent | e3331758f12da22f4103eec7efe1b5304a9be5e9 (diff) | |
| parent | b9dbddf6dace2094061d5093743f29c100cfd534 (diff) | |
| download | git-b16b60f71b2354cbad5f2dc16bd5f6cf7d617579.zip git-b16b60f71b2354cbad5f2dc16bd5f6cf7d617579.tar.gz git-b16b60f71b2354cbad5f2dc16bd5f6cf7d617579.tar.bz2 | |
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
Diffstat (limited to 'commit.h')
| -rw-r--r-- | commit.h | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -194,8 +194,8 @@ struct commit_graft { typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *); struct commit_graft *read_graft_line(struct strbuf *line); -int register_commit_graft(struct commit_graft *, int); -struct commit_graft *lookup_commit_graft(const struct object_id *oid); +int register_commit_graft(struct repository *r, struct commit_graft *, int); +struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid); extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2); extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos); @@ -209,15 +209,15 @@ extern struct commit_list *get_merge_bases_many_dirty(struct commit *one, int n, struct oid_array; struct ref; -extern int register_shallow(const struct object_id *oid); +extern int register_shallow(struct repository *r, const struct object_id *oid); extern int unregister_shallow(const struct object_id *oid); extern int for_each_commit_graft(each_commit_graft_fn, void *); -extern int is_repository_shallow(void); +extern int is_repository_shallow(struct repository *r); extern struct commit_list *get_shallow_commits(struct object_array *heads, int depth, int shallow_flag, int not_shallow_flag); extern struct commit_list *get_shallow_commits_by_rev_list( int ac, const char **av, int shallow_flag, int not_shallow_flag); -extern void set_alternate_shallow_file(const char *path, int override); +extern void set_alternate_shallow_file(struct repository *r, const char *path, int override); extern int write_shallow_commits(struct strbuf *out, int use_pack_protocol, const struct oid_array *extra); extern void setup_alternate_shallow(struct lock_file *shallow_lock, |