Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
help: drop prepend function in favor of xstrfmt
[gitweb.git]
/
builtin
/
reset.c
diff --git
a/builtin/reset.c
b/builtin/reset.c
index 4c08ddc1cacc29f2098bb81b434d76f315346dd4..c503e75a590df93bcc46e564583352dcffa60891 100644
(file)
--- a/
builtin/reset.c
+++ b/
builtin/reset.c
@@
-36,7
+36,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(
), F_OK);
}
static int reset_index(const unsigned char *sha1, int reset_type, int quiet)