Merge branch 'js/range-diff-noprefix'

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

diff --git a/builtin/worktree.c b/builtin/worktree.c
index a5bb02b2076a27a78947fda25c1e16dafd637622..fe706563273842262f7c93698c7cf9199d99d5ba 100644 (file)
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -350,7 +350,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, "../..");
@@ -880,7 +880,7 @@ static void check_clean_worktree(struct worktree *wt,
                          original_path);
        ret = xread(cp.out, buf, sizeof(buf));
        if (ret)
-               die(_("'%s' is dirty, use --force to delete it"),
+               die(_("'%s' contains modified or untracked files, use --force to delete it"),
                    original_path);
        close(cp.out);
        ret = finish_command(&cp);