Merge branch 'nd/corrupt-worktrees' into maint

diff --git a/notes.c b/notes.c
index be72780a8f3bb5c28341b0125c06caa513ec1488..532ec37865768d05a31606f495b4f0c1645ea757 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -988,7 +988,7 @@ void init_notes(struct notes_tree *t, const char *notes_ref,
                combine_notes_fn combine_notes, int flags)
 {
        struct object_id oid, object_oid;
-       unsigned mode;
+       unsigned short mode;
        struct leaf_node root_tree;
 
        if (!t)