Merge gitk changes from Paul Mackerras at git://ozlabs.org/~paulus/gitk

[git.git] / builtin / blame.c

diff --git a/builtin/blame.c b/builtin/blame.c
index f028e8aec82d0936951418f936123041c3b516ad..b35bd6249de66d02b7f33eb7aae4866193447156 100644 (file)
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -2038,14 +2038,8 @@ static int git_blame_config(const char *var, const char *value, void *cb)
                return 0;
        }
 
-       switch (userdiff_config(var, value)) {
-       case 0:
-               break;
-       case -1:
+       if (userdiff_config(var, value) < 0)
                return -1;
-       default:
-               return 0;
-       }
 
        return git_default_config(var, value, cb);
 }