By introducing this commit, 'git commit/status' will additionally show
'Submodules modified' section given by 'git --cached submodule summary' just
before 'Untracked files' section.
Signed-off-by: Ping Yin <pkufranky@xxxxxxxxx>
---
wt-status.c | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/wt-status.c b/wt-status.c
index c0c2472..df5be80 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -7,6 +7,7 @@
#include "diff.h"
#include "revision.h"
#include "diffcore.h"
+#include "run-command.h"
int wt_status_relative_paths = 1;
int wt_status_use_color = 0;
@@ -271,6 +272,30 @@ static void wt_status_print_changed(struct wt_status *s)
wt_read_cache(s);
run_diff_files(&rev, 0);
}
+static void wt_status_print_submodule_summary(struct wt_status *s)
+{
+ struct child_process sm_summary;
+ const char *argv[] = {
+ "submodule",
+ "summary",
+ "--cached",
+ s->amend ? "HEAD^" : "HEAD",
+ NULL
+ };
+ char index[PATH_MAX];
+ const char *env[2] = { index, NULL };
+ snprintf(index, sizeof(index), "GIT_INDEX_FILE=%s", s->index_file);
+
+ memset(&sm_summary, 0, sizeof(sm_summary));
+ sm_summary.argv = argv;
+ sm_summary.env = env;
+ sm_summary.git_cmd = 1;
+ sm_summary.no_stdin = 1;
+ fflush(s->fp);
+ sm_summary.out = dup(fileno(s->fp)); /* run_command closes it */
+ sm_summary.no_stderr = 1;
+ run_command(&sm_summary);
+}
static void wt_status_print_untracked(struct wt_status *s)
{
@@ -374,6 +399,9 @@ void wt_status_print(struct wt_status *s)
}
wt_status_print_changed(s);
+ // we must flush s->fp here since the following call will write to s->fp in a child process
+ fflush(s->fp);
+ wt_status_print_submodule_summary(s);
wt_status_print_untracked(s);
if (s->verbose && !s->is_initial)
--
1.5.4.rc2.9.gf5146-dirty
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
