diff options
| author | Andrew Wong <andrew.kw.w@gmail.com> | 2013-07-18 18:58:04 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-19 11:20:28 -0700 |
| commit | 7f3b8c628eaea8ccbe83f605b00d629553b70b42 (patch) | |
| tree | 59901974c510ee564a76de1c18af7832a4298de3 | |
| parent | 4c7f1819b3c142ace98269a556bc929c80e7c9fd (diff) | |
| download | git-mm/color-auto-default.tar.gz | |
git add -e: Explicitly specify that patch should have no colormm/color-auto-default
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>
| -rw-r--r-- | builtin/add.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/add.c b/builtin/add.c index ab1c9e8fb7..8b2aa5bff1 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) |