diff options
| author | Stefan Beller <sbeller@google.com> | 2018-05-17 22:51:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-17 23:13:10 (GMT) |
| commit | 102de880d24fe66a8916e7c984e5bf8db6be047c (patch) | |
| tree | 0368ad2a280ca777b8edf01e77fb0ed1258c8c32 /builtin/pull.c | |
| parent | 0437a2e365f3b9156097d029ca6f91cbb8bffd5e (diff) | |
| download | git-102de880d24fe66a8916e7c984e5bf8db6be047c.zip git-102de880d24fe66a8916e7c984e5bf8db6be047c.tar.gz git-102de880d24fe66a8916e7c984e5bf8db6be047c.tar.bz2 | |
path.c: migrate global git_path_* to take a repository argument
Migrate all git_path_* functions that are defined in path.c to take a
repository argument. Unlike other patches in this series, do not use the
#define trick, as we rewrite the whole function, which is rather small.
This doesn't migrate all the functions, as other builtins have their own
local path functions defined using GIT_PATH_FUNC. So keep that macro
around to serve the other locations.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 e32d6cd..d21239c 100644 --- a/builtin/pull.c +++ b/builtin/pull.c @@ -351,7 +351,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; @@ -857,7 +857,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)) |