From 7f3b8c628eaea8ccbe83f605b00d629553b70b42 Mon Sep 17 00:00:00 2001 From: Andrew Wong Date: Thu, 18 Jul 2013 18:58:04 -0400 Subject: 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 Acked-by: Matthieu Moy Signed-off-by: Junio C Hamano diff --git a/builtin/add.c b/builtin/add.c index ab1c9e8..8b2aa5b 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -238,6 +238,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) -- cgit v0.10.2-6-g49f6