Merge branch 'jc/submodule-anchor-git-dir' into maint

diff --git a/dir.c b/dir.c
index 6172b3438d356d0359c2158708c718c6694e183a..0ea235f3d643d7a9072aca75d7317d1fd7552b4d 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -2364,7 +2364,7 @@ void write_untracked_extension(struct strbuf *out, struct untracked_cache *untra
 
        varint_len = encode_varint(untracked->ident.len, varbuf);
        strbuf_add(out, varbuf, varint_len);
-       strbuf_add(out, untracked->ident.buf, untracked->ident.len);
+       strbuf_addbuf(out, &untracked->ident);
 
        strbuf_add(out, ouc, ouc_size(len));
        free(ouc);