Move diff.renamelimit out of default configuration.
Otherwise we would end up linking all the unneeded stuff into git-daemon only to link with git_default_config. Signed-off-by: Junio C Hamano <junkio@cox.net>
Junio C Hamano committed
Nov 21, 2005 at 22:52 UTC
9ce392f4826558357af2b2c7eb6ad876fdb53a91
8 files changed
+19
-9
Makefile
+2
-1
@@ -482,7 +482,8 @@ deb: dist
482
### Cleaning rules
483
484
clean:
485
- rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o git $(PROGRAMS) $(LIB_FILE)
485
+ rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o $(LIB_FILE)
486
+ rm -f $(PROGRAMS) $(SIMPLE_PROGRAMS) git$X
487
rm -f $(filter-out gitk,$(SCRIPTS))
488
rm -f *.spec *.pyc *.pyo
489
rm -rf $(GIT_TARNAME)
config.c
-5
@@ -236,11 +236,6 @@ int git_default_config(const char *var, const char *value)
236
return 0;
237
}
238
239
- if (!strcmp(var, "diff.renamelimit")) {
240
- diff_rename_limit_default = git_config_int(var, value);
241
- return 0;
242
- }
243
-
239
/* Add other config variables here.. */
240
return 0;
241
}
diff-files.c
+1
-1
@@ -38,7 +38,7 @@ int main(int argc, const char **argv)
38
const char *prefix = setup_git_directory();
39
int entries, i;
40
41
- git_config(git_default_config);
41
+ git_config(git_diff_config);
42
diff_setup(&diff_options);
43
while (1 < argc && argv[1][0] == '-') {
44
if (!strcmp(argv[1], "--")) {
diff-index.c
+1
-1
@@ -180,7 +180,7 @@ int main(int argc, const char **argv)
180
int allow_options = 1;
181
int i;
182
183
- git_config(git_default_config);
183
+ git_config(git_diff_config);
184
diff_setup(&diff_options);
185
for (i = 1; i < argc; i++) {
186
const char *arg = argv[i];
diff-stages.c
+3
@@ -55,6 +55,9 @@ int main(int ac, const char **av)
55
{
56
int stage1, stage2;
57
58
+ setup_git_directory();
59
+
60
+ git_config(git_diff_config);
61
read_cache();
62
diff_setup(&diff_options);
63
while (1 < ac && av[1][0] == '-') {
diff-tree.c
+1
-1
@@ -164,7 +164,7 @@ int main(int argc, const char **argv)
164
unsigned char sha1[2][20];
165
const char *prefix = setup_git_directory();
166
167
- git_config(git_default_config);
167
+ git_config(git_diff_config);
168
nr_sha1 = 0;
169
diff_setup(&diff_options);
170
diff.c
+10
@@ -15,6 +15,16 @@ static int use_size_cache;
15
16
int diff_rename_limit_default = -1;
17
18
+int git_diff_config(const char *var, const char *value)
19
+{
20
+ if (!strcmp(var, "diff.renamelimit")) {
21
+ diff_rename_limit_default = git_config_int(var, value);
22
+ return 0;
23
+ }
24
+
25
+ return git_default_config(var, value);
26
+}
27
+
28
static char *quote_one(const char *str)
29
{
30
int needlen;
diff.h
+1
@@ -77,6 +77,7 @@ extern int diff_scoreopt_parse(const char *opt);
77
#define DIFF_SETUP_USE_CACHE 2
78
#define DIFF_SETUP_USE_SIZE_CACHE 4
79
80
+extern int git_diff_config(const char *var, const char *value);
81
extern void diff_setup(struct diff_options *);
82
extern int diff_opt_parse(struct diff_options *, const char **, int);
83
extern int diff_setup_done(struct diff_options *);