summaryrefslogtreecommitdiff
path: root/builtin/reset.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-06-29 17:24:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-06-29 17:43:28 (GMT)
commitb16b60f71b2354cbad5f2dc16bd5f6cf7d617579 (patch)
tree8afa4e7dd5c9277fb6a28f9b5e8813ff7aa069fb /builtin/reset.c
parente3331758f12da22f4103eec7efe1b5304a9be5e9 (diff)
parentb9dbddf6dace2094061d5093743f29c100cfd534 (diff)
downloadgit-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 'builtin/reset.c')
-rw-r--r--builtin/reset.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c
index a862c70..ffe41c9 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)