Merge branch 'zj/term-columns' into maint

diff --git a/builtin/add.c b/builtin/add.c
index 1c42900ff8c55a94ccfd1d214567d0f64d615412..b79336d712b4c71cc2f026b0e9f42ea0bcebfc6f 100644 (file)
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -280,6 +280,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;
+       DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
        out = open(file, O_CREAT | O_WRONLY, 0644);
        if (out < 0)
                die (_("Could not open '%s' for writing."), file);