Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
path.c: migrate global git_path_* to take a repository argument
[gitweb.git]
/
builtin
/
reset.c
diff --git
a/builtin/reset.c
b/builtin/reset.c
index 7f1c3f02a302128d6c00c35b8783c1a62353b37a..a9136a163c0f168e0ce21aacd0a1675a75ac8401 100644
(file)
--- 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)