From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 23 Jan 2010 00:08:10 +0000 (-0800)
Subject: Merge branch 'jl/submodule-diff'
X-Git-Tag: v1.7.0-rc0~21
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c6ec7efdd4c63f5c53184651cb05748e7bc71075;p=git.git

Merge branch 'jl/submodule-diff'

* jl/submodule-diff:
  Performance optimization for detection of modified submodules
  git status: Show uncommitted submodule changes too when enabled
  Teach diff that modified submodule directory is dirty
  Show submodules as modified when they contain a dirty work tree
---

c6ec7efdd4c63f5c53184651cb05748e7bc71075
diff --cc submodule.c
index 3007f7d5a,3f851deb6..f657bee37
--- a/submodule.c
+++ b/submodule.c
@@@ -4,8 -4,9 +4,9 @@@
  #include "diff.h"
  #include "commit.h"
  #include "revision.h"
+ #include "run-command.h"
  
 -int add_submodule_odb(const char *path)
 +static int add_submodule_odb(const char *path)
  {
  	struct strbuf objects_directory = STRBUF_INIT;
  	struct alternate_object_database *alt_odb;