From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 13 Feb 2012 19:42:18 +0000 (-0800)
Subject: Merge branch 'js/add-e-submodule-fix' into maint
X-Git-Tag: v1.7.9.1~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4daf6fc837f7cc84335958b9d9e8a29e41b4ee8e;hp=87cb3b82a42613dc3ffd1eddf95f8c306a045ad1;p=git.git

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
---

diff --git a/builtin/add.c b/builtin/add.c
index 1c42900ff..b79336d71 100644
--- 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);