Andrew Wong <andrew.k...@gmail.com> writes: > After this commit: > 4c7f1819b3c142ace98269a556bc929c80e7c9fd make color.ui default to 'auto' > the patch file for 'git add -e' receives all the color codes. This is because > diffopt.use_color defaults to -1, which causes want_color to now return > 'auto'.
Oops, indeed. The code was relying on the user's config not being loaded (hence color.ui was previously ignored), and now has to explicitely disable color. I'm wondering whether there are other instances of this. I checked that "git format-patch" is not broken, but I hope we did not forget others. > --- a/builtin/add.c > +++ b/builtin/add.c > @@ -343,6 +343,7 @@ static int edit_patch(int argc, const char **argv, const > char *prefix) > > argc = setup_revisions(argc, argv, &rev, NULL); > rev.diffopt.output_format = DIFF_FORMAT_PATCH; > + rev.diffopt.use_color = 0; > DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES); > out = open(file, O_CREAT | O_WRONLY, 0666); > if (out < 0) Acknowledged-by: Matthieu Moy <matthieu....@imag.fr> -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
