Merge branch 'jk/sanity' into maint

diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index 2379e11069ef223a82580a9451ede8fbdb1eb8d9..8c693e756852ef2ec3aac3bfc77d71c6258a8306 100644 (file)
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -90,7 +90,7 @@ static int debug_merge(const struct cache_entry * const *stages,
        debug_stage("index", stages[0], o);
        for (i = 1; i <= o->merge_size; i++) {
                char buf[24];
-               sprintf(buf, "ent#%d", i);
+               xsnprintf(buf, sizeof(buf), "ent#%d", i);
                debug_stage(buf, stages[i], o);
        }
        return 0;