summaryrefslogtreecommitdiff
path: root/submodule.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-01-23 00:08:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-01-23 00:08:10 (GMT)
commitc6ec7efdd4c63f5c53184651cb05748e7bc71075 (patch)
tree4f9d0de8273ca2d608e172367b167c0b1774b05c /submodule.c
parent16735ae0f8a8e2df5e54807fd0a5930eb97dcb7a (diff)
parente3d42c4773bccebb50f01b108d20b06c6a11e615 (diff)
downloadgit-c6ec7efdd4c63f5c53184651cb05748e7bc71075.zip
git-c6ec7efdd4c63f5c53184651cb05748e7bc71075.tar.gz
git-c6ec7efdd4c63f5c53184651cb05748e7bc71075.tar.bz2
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
Diffstat (limited to 'submodule.c')
-rw-r--r--submodule.c49
1 files changed, 49 insertions, 0 deletions
diff --git a/submodule.c b/submodule.c
index 3007f7d..f657bee 100644
--- a/submodule.c
+++ b/submodule.c
@@ -4,6 +4,7 @@
#include "diff.h"
#include "commit.h"
#include "revision.h"
+#include "run-command.h"
static int add_submodule_odb(const char *path)
{
@@ -112,3 +113,51 @@ void show_submodule_summary(FILE *f, const char *path,
}
strbuf_release(&sb);
}
+
+int is_submodule_modified(const char *path)
+{
+ int len;
+ struct child_process cp;
+ const char *argv[] = {
+ "status",
+ "--porcelain",
+ NULL,
+ };
+ char *env[3];
+ struct strbuf buf = STRBUF_INIT;
+
+ strbuf_addf(&buf, "%s/.git/", path);
+ if (!is_directory(buf.buf)) {
+ strbuf_release(&buf);
+ /* The submodule is not checked out, so it is not modified */
+ return 0;
+
+ }
+ strbuf_reset(&buf);
+
+ strbuf_addf(&buf, "GIT_WORK_TREE=%s", path);
+ env[0] = strbuf_detach(&buf, NULL);
+ strbuf_addf(&buf, "GIT_DIR=%s/.git", path);
+ env[1] = strbuf_detach(&buf, NULL);
+ env[2] = NULL;
+
+ memset(&cp, 0, sizeof(cp));
+ cp.argv = argv;
+ cp.env = (const char *const *)env;
+ cp.git_cmd = 1;
+ cp.no_stdin = 1;
+ cp.out = -1;
+ if (start_command(&cp))
+ die("Could not run git status --porcelain");
+
+ len = strbuf_read(&buf, cp.out, 1024);
+ close(cp.out);
+
+ if (finish_command(&cp))
+ die("git status --porcelain failed");
+
+ free(env[0]);
+ free(env[1]);
+ strbuf_release(&buf);
+ return len != 0;
+}