Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maint

diff --git a/walker.c b/walker.c
index 633596e06fcaa1154980f95c858c61379c968d49..1dd86b8f33e04cfc6c0616578416acb1160b5718 100644 (file)
--- a/walker.c
+++ b/walker.c
@@ -60,6 +60,7 @@ static int process_tree(struct walker *walker, struct tree *tree)
        return 0;
 }
 
+/* Remember to update object flag allocation in object.h */
 #define COMPLETE       (1U << 0)
 #define SEEN           (1U << 1)
 #define TO_SCAN                (1U << 2)