unpack-trees: oneway_merge to update submodules

diff --git a/column.h b/column.h
index ec7e1d26e5a4f343d8ba7e1ba457ecd783246775..0a61917fa75484622e39ef54bfbc7d8a43b059ed 100644 (file)
--- a/column.h
+++ b/column.h
@@ -4,6 +4,8 @@
 #define COL_LAYOUT_MASK   0x000F
 #define COL_ENABLE_MASK   0x0030   /* always, never or auto */
 #define COL_PARSEOPT      0x0040   /* --column is given from cmdline */
+#define COL_DENSE         0x0080   /* Shrink columns when possible,
+                                     making space for more columns */
 
 #define COL_DISABLED      0x0000   /* must be zero */
 #define COL_ENABLED       0x0010
@@ -37,4 +39,7 @@ static inline int column_active(unsigned int colopts)
 extern void print_columns(const struct string_list *list, unsigned int colopts,
                          const struct column_options *opts);
 
+extern int run_column_filter(int colopts, const struct column_options *);
+extern int stop_column_filter(void);
+
 #endif