diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 20:23:10 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 20:23:10 +0200 |
| commit | 6a5b9ce5e12f039b126b1c97be7ba1b63ace5149 (patch) | |
| tree | 9248151be0217a816ebbeca90f49ada9b74b951e /builtin/add.c | |
| parent | Merge branch 'jc/simple-add-must-be-a-no-op' (diff) | |
| parent | git add -e: Explicitly specify that patch should have no color (diff) | |
| download | git-6a5b9ce5e12f039b126b1c97be7ba1b63ace5149.tar.xz git-6a5b9ce5e12f039b126b1c97be7ba1b63ace5149.zip | |
Merge branch 'mm/color-auto-default'
A finishing touch to fix breakage to "add -e" caused by defaulting
ui.color to "auto".
* mm/color-auto-default:
git add -e: Explicitly specify that patch should have no color
Diffstat (limited to 'builtin/add.c')
| -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 f45d9d4865..8266a9cb70 100644 --- 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) |