format-patch: replace erroneous and condition

Denton-L · gitster · commit 46273df7bfdd · 2019-10-16T10:26:42.000+09:00
Commit 30984ed (format-patch: support deep threading, 2009-02-19), introduced the following lines: #define THREAD_SHALLOW 1 [...] thread = git_config_bool(var, value) && THREAD_SHALLOW; Since git_config_bool() returns a bool, the trailing `&& THREAD_SHALLOW` is a no-op. Replace this errorneous and condition with a ternary statement so that it is clear what the configured value is when a boolean is given. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff --git a/builtin/log.c b/builtin/log.c
@@ -835,7 +835,7 @@ static int git_format_config(const char *var, const char *value, void *cb)
 			thread = THREAD_SHALLOW;
 			return 0;
 		}
-		thread = git_config_bool(var, value) && THREAD_SHALLOW;
+		thread = git_config_bool(var, value) ? THREAD_SHALLOW : THREAD_UNSET;
 		return 0;
 	}
 	if (!strcmp(var, "format.signoff")) {

Original file line number	Diff line number	Diff line change
`@@ -835,7 +835,7 @@ static int git_format_config(const char var, const char value, void *cb)`
`835`	`835`	`thread = THREAD_SHALLOW;`
`836`	`836`	`return 0;`
`837`	`837`	`}`
`838`		`- thread = git_config_bool(var, value) && THREAD_SHALLOW;`
	`838`	`+ thread = git_config_bool(var, value) ? THREAD_SHALLOW : THREAD_UNSET;`
`839`	`839`	`return 0;`
`840`	`840`	`}`
`841`	`841`	`if (!strcmp(var, "format.signoff")) {`