summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 18:23:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-22 18:23:10 (GMT)
commit6a5b9ce5e12f039b126b1c97be7ba1b63ace5149 (patch)
tree9248151be0217a816ebbeca90f49ada9b74b951e
parent06cbc13c6cb8867af1127ac52e005b3c36506320 (diff)
parent7f3b8c628eaea8ccbe83f605b00d629553b70b42 (diff)
downloadgit-6a5b9ce5e12f039b126b1c97be7ba1b63ace5149.zip
git-6a5b9ce5e12f039b126b1c97be7ba1b63ace5149.tar.gz
git-6a5b9ce5e12f039b126b1c97be7ba1b63ace5149.tar.bz2
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
-rw-r--r--builtin/add.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/builtin/add.c b/builtin/add.c
index f45d9d4..8266a9c 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)