Merge branch 'ds/add-i-color-configuration-fix' into next

The reimplemented "git add -i" did not honor color.ui configuration.

* ds/add-i-color-configuration-fix:
  add: test use of brackets when color is disabled
  add: check color.ui for interactive add
This commit is contained in:
Junio C Hamano
2023-06-15 14:04:55 -07:00
2 changed files with 39 additions and 1 deletions

View File

@ -274,7 +274,7 @@ static int add_config(const char *var, const char *value, void *cb)
return 0;
}
return git_default_config(var, value, cb);
return git_color_default_config(var, value, cb);
}
static const char embedded_advice[] = N_(