From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Sep 2025 19:05:33 +0000 (-0700)
Subject: Merge branch 'jk/color-variable-fixes' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8aa3006a1e8948f4e0c72955ae23f6760736fda6;p=thirdparty%2Fgit.git

Merge branch 'jk/color-variable-fixes' into next

Some places in the code confused a variable that is *not* a boolean
to enable color but is an enum that records what the user requested
to do about color.  A couple of bugs of this sort have been fixed,
while the code has been cleaned up to prevent similar bugs in the
future.

* jk/color-variable-fixes:
  config: store want_color() result in a separate bool
  add-interactive: retain colorbool values longer
  color: return bool from want_color()
  color: use git_colorbool enum type to store colorbools
  pretty: use format_commit_context.auto_color as colorbool
  diff: stop passing ecbdata->use_color as boolean
  diff: pass o->use_color directly to fill_metainfo()
  diff: don't use diff_options.use_color as a strict bool
  diff: simplify color_moved check when flushing
  grep: don't treat grep_opt.color as a strict bool
  color: return enum from git_config_colorbool()
  color: use GIT_COLOR_* instead of numeric constants
---

8aa3006a1e8948f4e0c72955ae23f6760736fda6
diff --cc builtin/range-diff.c
index aafcc99b96,0d51ddd623..1bc082a869
--- a/builtin/range-diff.c
+++ b/builtin/range-diff.c
@@@ -6,7 -6,7 +6,8 @@@
  #include "parse-options.h"
  #include "range-diff.h"
  #include "config.h"
 +#include "parse.h"
+ #include "color.h"
  
  
  static const char * const builtin_range_diff_usage[] = {