summaryrefslogtreecommitdiff
path: root/builtin/cat-file.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-02-14 12:57:17 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-02-14 12:57:17 -0800
commit63d37c3062e13cb2828edf63bc03cce1b6c41fd0 (patch)
tree058aa2fe3f357e626c3458a89443ea07fa0f5345 /builtin/cat-file.c
parentSync with 1.7.9.1 (diff)
parentdrop odd return value semantics from userdiff_config (diff)
downloadtgif-63d37c3062e13cb2828edf63bc03cce1b6c41fd0.tar.xz
Merge branch 'jk/userdiff-config-simplify'
* jk/userdiff-config-simplify: drop odd return value semantics from userdiff_config
Diffstat (limited to 'builtin/cat-file.c')
-rw-r--r--builtin/cat-file.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 07bd984084..8ed501f220 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -226,14 +226,8 @@ static const char * const cat_file_usage[] = {
static int git_cat_file_config(const char *var, const char *value, void *cb)
{
- 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);
}