Merge branch 'jk/fetch-reflog-df-conflict'

diff --git a/builtin/blame.c b/builtin/blame.c
index 3838be2b0274fbd72b200c2bf294e4d2842a020c..303e217ae919f21aa4d4574bd1720b5f4d635c32 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2286,7 +2286,7 @@ static struct commit *fake_working_tree_commit(struct diff_options *opt,
        commit->date = now;
        parent_tail = &commit->parents;
 
-       if (!resolve_ref_unsafe("HEAD", head_sha1, 1, NULL))
+       if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, head_sha1, NULL))
                die("no such ref: HEAD");
 
        parent_tail = append_parent(parent_tail, head_sha1);