mirror of
https://github.com/git/git.git
synced 2024-11-29 04:54:56 +08:00
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
This commit is contained in:
commit
6a5b9ce5e1
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user