am: drop "dir" parameter from am_state_init

diff --git a/builtin/pull.c b/builtin/pull.c
index 3ecb881b0bcacbf1a453bf9a6cb95ae00cdecb1d..d8032e838c63e4253d7ac544e52c331ec1751e77 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -332,7 +332,7 @@ static int git_pull_config(const char *var, const char *value, void *cb)
  */
 static void get_merge_heads(struct sha1_array *merge_heads)
 {
-       const char *filename = git_path("FETCH_HEAD");
+       const char *filename = git_path_fetch_head();
        FILE *fp;
        struct strbuf sb = STRBUF_INIT;
        unsigned char sha1[GIT_SHA1_RAWSZ];
@@ -791,7 +791,7 @@ int cmd_pull(int argc, const char **argv, const char *prefix)
        if (read_cache_unmerged())
                die_resolve_conflict("pull");
 
-       if (file_exists(git_path("MERGE_HEAD")))
+       if (file_exists(git_path_merge_head()))
                die_conclude_merge();
 
        if (get_sha1("HEAD", orig_head))