Merge branch 'maint-1.7.1' into maint-1.7.2

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

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 1df0f654e65b3747979235f77dea5e8aa25f1a09..5506e31318517831c6f2143d7a8b01e46763da1a 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -539,9 +539,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 56a4e0af6b35ea9f6d86accad27a1c87bc5ad0d9..3a5fca51590db53747f8712f733aa01e5840d8fb 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -331,7 +331,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;
        }