summaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-23 16:59:05 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-23 16:59:05 (GMT)
commit6bb696c304d2bf27b267202af193d99cc7995370 (patch)
treef11a3b29867470f1b3e5d90f8f9b1b88930b5972 /cache.h
parent91810abc2fff38bed60028ae5bab9ffb2f11ef3d (diff)
parent5a2df368c26e4a993db9d09f221af1063d0fe9a8 (diff)
downloadgit-6bb696c304d2bf27b267202af193d99cc7995370.zip
git-6bb696c304d2bf27b267202af193d99cc7995370.tar.gz
git-6bb696c304d2bf27b267202af193d99cc7995370.tar.bz2
Merge branch 'mg/config-symbolic-constants'
* mg/config-symbolic-constants: config: Give error message when not changing a multivar config: define and document exit codes
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/cache.h b/cache.h
index f1c0887..28a921d 100644
--- a/cache.h
+++ b/cache.h
@@ -1023,6 +1023,16 @@ extern const char *packed_object_info_detail(struct packed_git *, off_t, unsigne
/* Dumb servers support */
extern int update_server_info(int);
+/* git_config_parse_key() returns these negated: */
+#define CONFIG_INVALID_KEY 1
+#define CONFIG_NO_SECTION_OR_NAME 2
+/* git_config_set(), git_config_set_multivar() return the above or these: */
+#define CONFIG_NO_LOCK -1
+#define CONFIG_INVALID_FILE 3
+#define CONFIG_NO_WRITE 4
+#define CONFIG_NOTHING_SET 5
+#define CONFIG_INVALID_PATTERN 6
+
typedef int (*config_fn_t)(const char *, const char *, void *);
extern int git_default_config(const char *, const char *, void *);
extern int git_config_from_file(config_fn_t fn, const char *, void *);