From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Dec 2010 00:37:34 +0000 (-0800)
Subject: Merge branch 'maint-1.7.0' into maint-1.7.1
X-Git-Tag: v1.7.1.3~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e760924cbeb19c6e45febdb31d9d6c95deaf2b43?hp=520ea857e66f25a681401fd534b2f0d099fd2d31

Merge branch 'maint-1.7.0' into maint-1.7.1

* maint-1.7.0:
add: introduce add.ignoreerrors synonym for add.ignore-errors
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index eae06e7c3e..6a07fe60e7 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -530,9 +530,13 @@ core.sparseCheckout::
 	linkgit:git-read-tree[1] for more information.
 
 add.ignore-errors::
+add.ignoreErrors::
 	Tells 'git add' to continue adding files when some files cannot be
 	added due to indexing errors. Equivalent to the '--ignore-errors'
-	option of linkgit:git-add[1].
+	option of linkgit:git-add[1].  Older versions of git accept only
+	`add.ignore-errors`, which does not follow the usual naming
+	convention for configuration variables.  Newer versions of git
+	honor `add.ignoreErrors` as well.
 
 alias.*::
 	Command aliases for the linkgit:git[1] command wrapper - e.g.
diff --git a/builtin/add.c b/builtin/add.c
index 87d2980313..51eeabad86 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -328,7 +328,8 @@ static struct option builtin_add_options[] = {
 
 static int add_config(const char *var, const char *value, void *cb)
 {
-	if (!strcasecmp(var, "add.ignore-errors")) {
+	if (!strcasecmp(var, "add.ignoreerrors") ||
+	    !strcasecmp(var, "add.ignore-errors")) {
 		ignore_add_errors = git_config_bool(var, value);
 		return 0;
 	}