Move diff.renamelimit out of default configuration.

Junio C Hamano · Junio C Hamano · commit 9ce392f48265 · 2005-11-21T23:00:50.000-08:00
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 &lt;junkio@cox.net&gt;
diff --git a/Makefile b/Makefile
@@ -482,7 +482,8 @@ deb: dist
 ### Cleaning rules
 
 clean:
-	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o git $(PROGRAMS) $(LIB_FILE)
+	rm -f *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o $(LIB_FILE)
+	rm -f $(PROGRAMS) $(SIMPLE_PROGRAMS) git$X
 	rm -f $(filter-out gitk,$(SCRIPTS))
 	rm -f *.spec *.pyc *.pyo
 	rm -rf $(GIT_TARNAME)
diff --git a/config.c b/config.c
@@ -236,11 +236,6 @@ int git_default_config(const char *var, const char *value)
 		return 0;
 	}
 
-	if (!strcmp(var, "diff.renamelimit")) {
-		diff_rename_limit_default = git_config_int(var, value);
-		return 0;
-	}
-
 	/* Add other config variables here.. */
 	return 0;
 }
diff --git a/diff-files.c b/diff-files.c
@@ -38,7 +38,7 @@ int main(int argc, const char **argv)
 	const char *prefix = setup_git_directory();
 	int entries, i;
 
-	git_config(git_default_config);
+	git_config(git_diff_config);
 	diff_setup(&diff_options);
 	while (1 < argc && argv[1][0] == '-') {
 		if (!strcmp(argv[1], "--")) {
diff --git a/diff-index.c b/diff-index.c
@@ -180,7 +180,7 @@ int main(int argc, const char **argv)
 	int allow_options = 1;
 	int i;
 
-	git_config(git_default_config);
+	git_config(git_diff_config);
 	diff_setup(&diff_options);
 	for (i = 1; i < argc; i++) {
 		const char *arg = argv[i];
diff --git a/diff-stages.c b/diff-stages.c
@@ -55,6 +55,9 @@ int main(int ac, const char **av)
 {
 	int stage1, stage2;
 
+	setup_git_directory();
+
+	git_config(git_diff_config);
 	read_cache();
 	diff_setup(&diff_options);
 	while (1 < ac && av[1][0] == '-') {
diff --git a/diff-tree.c b/diff-tree.c
@@ -164,7 +164,7 @@ int main(int argc, const char **argv)
 	unsigned char sha1[2][20];
 	const char *prefix = setup_git_directory();
 
-	git_config(git_default_config);
+	git_config(git_diff_config);
 	nr_sha1 = 0;
 	diff_setup(&diff_options);
 
diff --git a/diff.c b/diff.c
@@ -15,6 +15,16 @@ static int use_size_cache;
 
 int diff_rename_limit_default = -1;
 
+int git_diff_config(const char *var, const char *value)
+{
+	if (!strcmp(var, "diff.renamelimit")) {
+		diff_rename_limit_default = git_config_int(var, value);
+		return 0;
+	}
+
+	return git_default_config(var, value);
+}
+
 static char *quote_one(const char *str)
 {
 	int needlen;
diff --git a/diff.h b/diff.h
@@ -77,6 +77,7 @@ extern int diff_scoreopt_parse(const char *opt);
 #define DIFF_SETUP_USE_CACHE		2
 #define DIFF_SETUP_USE_SIZE_CACHE	4
 
+extern int git_diff_config(const char *var, const char *value);
 extern void diff_setup(struct diff_options *);
 extern int diff_opt_parse(struct diff_options *, const char **, int);
 extern int diff_setup_done(struct diff_options *);

Original file line number	Diff line number	Diff line change
`@@ -236,11 +236,6 @@ int git_default_config(const char var, const char value)`
`236`	`236`	`return 0;`
`237`	`237`	`}`
`238`	`238`
`239`		`- if (!strcmp(var, "diff.renamelimit")) {`
`240`		`- diff_rename_limit_default = git_config_int(var, value);`
`241`		`- return 0;`
`242`		`- }`
`243`		`-`
`244`	`239`	`/* Add other config variables here.. */`
`245`	`240`	`return 0;`
`246`	`241`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,9 @@ int main(int ac, const char **av)`
`55`	`55`	`{`
`56`	`56`	`int stage1, stage2;`
`57`	`57`
	`58`	`+ setup_git_directory();`
	`59`	`+`
	`60`	`+ git_config(git_diff_config);`
`58`	`61`	`read_cache();`
`59`	`62`	`diff_setup(&diff_options);`
`60`	`63`	`while (1 < ac && av[1][0] == '-') {`