Merge branch 'sp/clip-read-write-to-8mb'

diff --git a/builtin/add.c b/builtin/add.c
index 9d52fc7915a5061a757ce937f24e894d65cb0dff..ae0bdc78bbf47094a2f0656ef8f3f561e60dc072 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -309,6 +309,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)