summaryrefslogtreecommitdiff
path: root/environment.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-19 20:37:21 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-19 20:37:21 -0700
commit61d7503da141f13bc916b36012760791761cc909 (patch)
tree2b1cff95e16f2ed1543e4790d682e2e4996e92b7 /environment.c
parent2d220862d43b4d54f3173f67956fc5221690fb7e (diff)
parent5bf29b950063c8fa2f3666cb6cf2ca20be61f3d1 (diff)
downloadgit-61d7503da141f13bc916b36012760791761cc909.tar.gz
Merge branch 'jc/replacing'
* jc/replacing: read_sha1_file(): allow selective bypassing of replacement mechanism inline lookup_replace_object() calls read_sha1_file(): get rid of read_sha1_file_repl() madness t6050: make sure we test not just commit replacement Declare lookup_replace_object() in cache.h, not in commit.h Conflicts: environment.c
Diffstat (limited to 'environment.c')
-rw-r--r--environment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/environment.c b/environment.c
index 7fe9f10124..94d58fd244 100644
--- a/environment.c
+++ b/environment.c
@@ -42,7 +42,7 @@ const char *editor_program;
const char *askpass_program;
const char *excludes_file;
enum auto_crlf auto_crlf = AUTO_CRLF_FALSE;
-int read_replace_refs = 1;
+int read_replace_refs = 1; /* NEEDSWORK: rename to use_replace_refs */
enum eol core_eol = EOL_UNSET;
enum safe_crlf safe_crlf = SAFE_CRLF_WARN;
unsigned whitespace_rule_cfg = WS_DEFAULT_RULE;