diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-08-24 15:30:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-08-24 15:30:43 -0700 |
| commit | 7b8419f0940dcb9c017fc66390dc6a6471ce5373 (patch) | |
| tree | 88c8f8c4ae2a7c3441578757ed6adba68691b303 /builtin/reset.c | |
| parent | a123b19eec0d5faa8df38b92418fe1834f2fe63b (diff) | |
| parent | f932729cc7707390f4d6739be1573e93ceb9df22 (diff) | |
| download | git-7b8419f0940dcb9c017fc66390dc6a6471ce5373.tar.gz git-7b8419f0940dcb9c017fc66390dc6a6471ce5373.tar.xz | |
Merge 'jk/git-path' into kn/for-each-tag
* jk/git-path:
memoize common git-path "constant" files
get_repo_path: refactor path-allocation
find_hook: keep our own static buffer
refs.c: remove_empty_directories can take a strbuf
refs.c: avoid git_path assignment in lock_ref_sha1_basic
refs.c: avoid repeated git_path calls in rename_tmp_log
refs.c: simplify strbufs in reflog setup and writing
path.c: drop git_path_submodule
refs.c: remove extra git_path calls from read_loose_refs
remote.c: drop extraneous local variable from migrate_file
prefer mkpathdup to mkpath in assignments
prefer git_pathdup to git_path in some possibly-dangerous cases
add_to_alternates_file: don't add duplicate entries
t5700: modernize style
cache.h: complete set of git_path_submodule helpers
cache.h: clarify documentation for git_path, et al
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 4c08ddc1c..c503e75a5 100644 --- 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) |