diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-05-17 15:51:51 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-05-18 08:13:10 +0900 |
| commit | 102de880d24fe66a8916e7c984e5bf8db6be047c (patch) | |
| tree | 0368ad2a280ca777b8edf01e77fb0ed1258c8c32 /builtin/reset.c | |
| parent | cache: convert get_graft_file to handle arbitrary repositories (diff) | |
| download | tgif-102de880d24fe66a8916e7c984e5bf8db6be047c.tar.xz | |
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/reset.c')
| -rw-r--r-- | builtin/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 7f1c3f02a3..a9136a163c 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -39,7 +39,7 @@ static const char *reset_type_names[] = { static inline int is_merge(void) { - return !access(git_path_merge_head(), F_OK); + return !access(git_path_merge_head(the_repository), F_OK); } static int reset_index(const struct object_id *oid, int reset_type, int quiet) |