summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorLibravatar Jens Lehmann <Jens.Lehmann@web.de>2010-01-24 15:09:00 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-01-24 21:04:31 -0800
commit721ceec1ad12625e90b395fd0be0fae9049ebc22 (patch)
tree3098483d3a51c1157b5bd9e1db7790e5137aaf2f /diff.c
parentgit diff: Don't test submodule dirtiness with --ignore-submodules (diff)
downloadtgif-721ceec1ad12625e90b395fd0be0fae9049ebc22.tar.xz
Teach diff --submodule that modified submodule directory is dirty
Since commit 8e08b4 git diff does append "-dirty" to the work tree side if the working directory of a submodule contains new or modified files. Lets do the same when the --submodule option is used. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
-rw-r--r--diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.c b/diff.c
index 160dbfd718..0190ec6d9f 100644
--- a/diff.c
+++ b/diff.c
@@ -1615,7 +1615,7 @@ static void builtin_diff(const char *name_a,
const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
show_submodule_summary(o->file, one ? one->path : two->path,
- one->sha1, two->sha1,
+ one->sha1, two->sha1, two->dirty_submodule,
del, add, reset);
return;
}