diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-06-29 10:24:33 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-29 10:43:28 -0700 |
| commit | b16b60f71b2354cbad5f2dc16bd5f6cf7d617579 (patch) | |
| tree | 8afa4e7dd5c9277fb6a28f9b5e8813ff7aa069fb /builtin/pull.c | |
| parent | Second batch for 2.19 cycle (diff) | |
| parent | commit: allow lookup_commit_graft to handle arbitrary repositories (diff) | |
| download | tgif-b16b60f71b2354cbad5f2dc16bd5f6cf7d617579.tar.xz | |
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 'builtin/pull.c')
| -rw-r--r-- | builtin/pull.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/pull.c b/builtin/pull.c index fe002a72f8..7197b22b16 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -356,7 +356,7 @@ static int git_pull_config(const char *var, const char *value, void *cb) */ static void get_merge_heads(struct oid_array *merge_heads) { - const char *filename = git_path_fetch_head(); + const char *filename = git_path_fetch_head(the_repository); FILE *fp; struct strbuf sb = STRBUF_INIT; struct object_id oid; @@ -864,7 +864,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix) if (read_cache_unmerged()) die_resolve_conflict("pull"); - if (file_exists(git_path_merge_head())) + if (file_exists(git_path_merge_head(the_repository))) die_conclude_merge(); if (get_oid("HEAD", &orig_head)) |