Merge branch 'fr_2.16-rc1' of git://github.com/jnavila/git

diff --git a/worktree.c b/worktree.c
index f8c40f2f5f8ce5b18c976b5281f5618adbeee4a7..f5da7d286d537fa99a1bd2dd5180068b9d85da2f 100644 (file)
--- a/worktree.c
+++ b/worktree.c
@@ -31,7 +31,7 @@ static void add_head_info(struct worktree *wt)
        target = refs_resolve_ref_unsafe(get_worktree_ref_store(wt),
                                         "HEAD",
                                         0,
-                                        wt->head_sha1, &flags);
+                                        &wt->head_oid, &flags);
        if (!target)
                return;