Merge branch 'js/update-index-ignore-removal-for-skip-worktree'

[thirdparty/git.git] / builtin / worktree.c

diff --git a/builtin/worktree.c b/builtin/worktree.c
index 7f094f8170ae7d55d453a2b0ab5db933ddf395ba..4de44f579af509137c10ae2c459b0aef62c52f35 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -10,7 +10,6 @@
 #include "run-command.h"
 #include "sigchain.h"
 #include "submodule.h"
-#include "refs.h"
 #include "utf8.h"
 #include "worktree.h"
 
@@ -350,7 +349,7 @@ static int add_worktree(const char *path, const char *refname,
         */
        strbuf_reset(&sb);
        strbuf_addf(&sb, "%s/HEAD", sb_repo.buf);
-       write_file(sb.buf, "%s", sha1_to_hex(null_sha1));
+       write_file(sb.buf, "%s", oid_to_hex(&null_oid));
        strbuf_reset(&sb);
        strbuf_addf(&sb, "%s/commondir", sb_repo.buf);
        write_file(sb.buf, "../..");