summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-11 11:09:09 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-11 11:09:09 -0700
commit4c3fda0920ef49b323416685ec843d6a12a27b3f (patch)
treeb50dcd5c23440056becbd89a2c6c0527892c2adc /cache.h
parentf6854cad2a7a7da0a360bd520d2a86af89a36c6c (diff)
parent9409c7a5b33d6a4d68f58ccb1034fa50c92cac68 (diff)
downloadgit-4c3fda0920ef49b323416685ec843d6a12a27b3f.tar.gz
Merge branch 'jc/maint-config-exit-status' into maint-1.7.11
* jc/maint-config-exit-status: config: "git config baa" should exit with status 1
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index 89581041ce..75b3bea92d 100644
--- a/cache.h
+++ b/cache.h
@@ -1103,6 +1103,7 @@ extern int update_server_info(int);
#define CONFIG_NO_WRITE 4
#define CONFIG_NOTHING_SET 5
#define CONFIG_INVALID_PATTERN 6
+#define CONFIG_GENERIC_ERROR 7
typedef int (*config_fn_t)(const char *, const char *, void *);
extern int git_default_config(const char *, const char *, void *);