Merge branch 'rs/column-leakfix' into maint-2.43

[thirdparty/git.git] / builtin / column.c

diff --git a/builtin/column.c b/builtin/column.c
index 798161bef28ee104885f063d276209664f9c5411..e80218f81f94b5fc7a3e4605527556da336bb6ff 100644 (file)
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -1,6 +1,6 @@
 #include "builtin.h"
-#include "cache.h"
 #include "config.h"
+#include "gettext.h"
 #include "strbuf.h"
 #include "parse-options.h"
 #include "string-list.h"
@@ -12,7 +12,8 @@ static const char * const builtin_column_usage[] = {
 };
 static unsigned int colopts;
 
-static int column_config(const char *var, const char *value, void *cb)
+static int column_config(const char *var, const char *value,
+                        const struct config_context *ctx UNUSED, void *cb)
 {
        return git_column_config(var, value, cb, &colopts);
 }