git add -e: Explicitly specify that patch should have no color
After 4c7f1819 (make color.ui default to 'auto', 2013-06-10), the patch file to be edited during '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'. By explicitly setting use_color to 0, we can ensure the diff output has no color codes in it. Signed-off-by: Andrew Wong <andrew.kw.w@gmail.com> Acked-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Andrew Wong committed
Jul 18, 2013 at 18:58 UTC
7f3b8c628eaea8ccbe83f605b00d629553b70b42
1 file changed
+1
builtin/add.c
+1
@@ -238,6 +238,7 @@ static int edit_patch(int argc, const char **argv, const char *prefix)
238
239
argc = setup_revisions(argc, argv, &rev, NULL);
240
rev.diffopt.output_format = DIFF_FORMAT_PATCH;
241
+ rev.diffopt.use_color = 0;
242
DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
243
out = open(file, O_CREAT | O_WRONLY, 0666);
244
if (out < 0)