Merge branch 'js/add-e-submodule-fix' into maint

* js/add-e-submodule-fix: add -e: do not show difference in a submodule that is merely dirty
git-mirror · Feb 13, 2012 · 4daf6fc · 4daf6fc
2 parents 87cb3b8 + 701825d
commit 4daf6fc
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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);