summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-02-27 22:47:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-02-27 22:47:45 (GMT)
commit2ae1c53b51ff78b13cc8abf8e9798a12140b7638 (patch)
treed9be860f24495d94c72cc3c127693244472cb3d7 /environment.c
parentfc96b7c9ba5034a408d508c663a96a15b8f8729c (diff)
downloadgit-2ae1c53b51ff78b13cc8abf8e9798a12140b7638.zip
git-2ae1c53b51ff78b13cc8abf8e9798a12140b7638.tar.gz
git-2ae1c53b51ff78b13cc8abf8e9798a12140b7638.tar.bz2
apply --whitespace: configuration option.
The new configuration option apply.whitespace can take one of "warn", "error", "error-all", or "strip". When git-apply is run to apply the patch to the index, they are used as the default value if there is no command line --whitespace option. Andrew can now tell people who feed him git trees to update to this version and say: git repo-config apply.whitespace error Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/environment.c b/environment.c
index 251e53c..16c08f0 100644
--- a/environment.c
+++ b/environment.c
@@ -17,6 +17,7 @@ int only_use_symrefs = 0;
int repository_format_version = 0;
char git_commit_encoding[MAX_ENCODING_LENGTH] = "utf-8";
int shared_repository = 0;
+const char *apply_default_whitespace = NULL;
static char *git_dir, *git_object_dir, *git_index_file, *git_refs_dir,
*git_graft_file;