Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
add core.usereplacerefs config option
[gitweb.git]
/
builtin
/
reset.c
diff --git
a/builtin/reset.c
b/builtin/reset.c
index a862c70fab99290b5faf3e700e88194589583329..ffe41c924b4810d79872fb5faf600a47e19508e5 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)