summaryrefslogtreecommitdiff
path: root/builtin/log.c
diff options
context:
space:
mode:
authorDenton Liu <liu.denton@gmail.com>2019-10-15 09:06:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-16 01:26:42 (GMT)
commit46273df7bfdd43e5f8a190d0a80a078ca55ce5ff (patch)
tree65038c10c03da9948c628f60b1df5b46b564f1ea /builtin/log.c
parent756fb0dedb72e8eec691d216198ccc23102d7072 (diff)
downloadgit-46273df7bfdd43e5f8a190d0a80a078ca55ce5ff.zip
git-46273df7bfdd43e5f8a190d0a80a078ca55ce5ff.tar.gz
git-46273df7bfdd43e5f8a190d0a80a078ca55ce5ff.tar.bz2
format-patch: replace erroneous and condition
Commit 30984ed2e9 (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>
Diffstat (limited to 'builtin/log.c')
-rw-r--r--builtin/log.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/log.c b/builtin/log.c
index 44b10b3..351f4ff 100644
--- 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")) {