From: brian m. carlson <sandals@crustytoothpaste.net>
Date: Sun, 18 Aug 2019 20:04:19 +0000 (+0000)
Subject: builtin/worktree: switch null_sha1 to null_oid
X-Git-Tag: v2.24.0-rc0~40^2~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f6ca67d673c66e5c3988a18c2ec56b7fef9a23b6;p=thirdparty%2Fgit.git

builtin/worktree: switch null_sha1 to null_oid

Switch the remaining use of null_sha1 to null_oid.

Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/worktree.c b/builtin/worktree.c
index a5bb02b207..0c0df3b0b8 100644
--- 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, "../..");