Skip to content

Commit

Permalink
add: introduce add.ignoreerrors synonym for add.ignore-errors
Browse files Browse the repository at this point in the history
The "[add] ignore-errors" tweakable introduced by v1.5.6-rc0~30^2 (Add
a config option to ignore errors for git-add, 2008-05-12) does not
follow the usual convention for naming values in the git configuration
file.

What convention?  Glad you asked.

	The section name indicates the affected subsystem.

	The subsection name, if any, indicates which of
	an unbound set of things to set the value for.

	The variable name describes the effect of tweaking
	this knob.

	The section and variable names can be broken into
	words using bumpyCaps in documentation as a hint to
	the reader.  These word breaks are not significant
	at the level of code, since the section and variable
	names are not case sensitive.

The name "add.ignore-errors" includes a dash, meaning a naive
configuration file like

	[add]
		ignoreErrors

does not have any effect.  Avoid such confusion by renaming to the
more consistent add.ignoreErrors, but keep the old version for
backwards compatibility.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jonathan Nieder authored and Junio C Hamano committed Dec 1, 2010
1 parent 593ce2b commit 6b3020a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
6 changes: 5 additions & 1 deletion Documentation/config.txt
Original file line number Diff line number Diff line change
Expand Up @@ -534,9 +534,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.
Expand Down
3 changes: 2 additions & 1 deletion builtin-add.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 6b3020a

Please sign in to comment.