Merge branch 'maint-1.7.0' into maint

[git.git] / notes.h

diff --git a/notes.h b/notes.h
index b7fafb448b6b8e50878548e1b5f6fa2bfe18e6a2..9f59277c516f7ac78bcc66f91a7d7013b2a77f65 100644 (file)
--- a/notes.h
+++ b/notes.h
@@ -40,6 +40,7 @@ extern struct notes_tree {
        char *ref;
        combine_notes_fn *combine_notes;
        int initialized;
+       int dirty;
 } default_notes_tree;
 
 /*
@@ -211,7 +212,7 @@ void format_note(struct notes_tree *t, const unsigned char *object_sha1,
 struct string_list;
 
 struct display_notes_opt {
-       int suppress_default_notes:1;
+       unsigned int suppress_default_notes:1;
        struct string_list *extra_notes_refs;
 };