summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-03 15:53:06 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-03 15:53:07 -0700
commit3e06f5ff3870279f3bf2f97d4a4256032575055e (patch)
tree28b499c52dda30a471536facf32a6a542c45a8eb /cache.h
parent16d26b168b371b2f4f86b1adb61470c6b08b27b9 (diff)
parent9409c7a5b33d6a4d68f58ccb1034fa50c92cac68 (diff)
downloadgit-3e06f5ff3870279f3bf2f97d4a4256032575055e.tar.gz
Merge branch 'jc/maint-config-exit-status'
The exit status code from "git config" was way overspecified while being incorrect. Update the implementation to give the documented status for a case that was documented, and introduce a new code for "all other errors". * 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 95daa690aa..eb4a0316d2 100644
--- a/cache.h
+++ b/cache.h
@@ -1110,6 +1110,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 *);