From: Johannes Schindelin Date: Tue, 7 Feb 2012 04:05:48 +0000 (+0100) Subject: add -e: do not show difference in a submodule that is merely dirty X-Git-Tag: v1.7.9.1~6^2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=701825de23da2bff6c784d33ff27f75e802abd81;p=git.git add -e: do not show difference in a submodule that is merely dirty When the HEAD of the submodule matches what is recorded in the index of the superproject, and it has local changes or untracked files, the patch offered by "git add -e" for editing shows a diff like this: diff --git a/submodule b/submodule
-deadbeef... +deadbeef...-dirty Because applying such a patch has no effect to the index, this is a useless noise. Generate the patch with IGNORE_DIRTY_SUBMODULES flag to prevent such a change from getting reported. This patch also loses the "-dirty" suffix from the output when the HEAD of the submodule is different from what is in the index of the superproject. As such dirtiness expressed by the suffix does not affect the result of the patch application at all, there is no information lost if we remove it. The user could still run "git status" before "git add -e" if s/he cares about the dirtiness. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- diff --git a/builtin/add.c b/builtin/add.c index c59b0c98f..68fd050e9 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -279,6 +279,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);