Add column layout skeleton and git-column

diff --git a/builtin/grep.c b/builtin/grep.c
index 9fc3e95cc610c9df7d2b17eae59ac2c161443982..e4ea90078384f198f5985596c64deb5f423e9e45 100644 (file)
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -265,11 +265,8 @@ static int grep_config(const char *var, const char *value, void *cb)
        struct grep_opt *opt = cb;
        char *color = NULL;
 
-       switch (userdiff_config(var, value)) {
-       case 0: break;
-       case -1: return -1;
-       default: return 0;
-       }
+       if (userdiff_config(var, value) < 0)
+               return -1;
 
        if (!strcmp(var, "grep.extendedregexp")) {
                if (git_config_bool(var, value))