[PATCH v2 0/5] builtin-status submodule summary
From: Ping Yin <hidden>
Date: 2016-06-15 22:44:23
Subsystem:
the rest · Maintainer:
Linus Torvalds
IMO, git submodule summary is not so useful for me if it's not
integrated into git-status. In fact i never use "git submodule
summary" directly. git-status with submodule summary support is very
useful to help user figure out what is going on in a more global level
when cooking the commit message.
So i think this series should go along with the submodule summary series.
The v2 series has following commits adding a new commit for documentation
git-submodule summary: --for-status option
builtin-status: submodule summary support
builtin-status: configurable submodule summary size
buitin-status: Add tests for submodule summary
git-status: Mention status.submodulesummary config in the documentation
and diff relative to v1 is (not containing the documetation patch)
diff --git a/t/t7502-status.sh b/t/t7502-status.sh
index a4cd553..33882c9 100755
--- a/t/t7502-status.sh
+++ b/t/t7502-status.sh@@ -187,9 +187,7 @@ test_expect_success "status submodule summary is disabled by default" ' git diff expect output ' -cd sm && -head=$(git rev-parse --verify HEAD | cut -c1-7) && -cd .. +head=$(cd sm && git rev-parse --short=7 --verify HEAD) cat > expect <<EOF # On branch master
diff --git a/wt-status.c b/wt-status.c
index c7cb69c..7a32c51 100644
--- a/wt-status.c
+++ b/wt-status.c@@ -223,7 +223,7 @@ static void wt_status_print_changed(struct wt_status *s) } static void wt_status_print_submodule_summary(struct wt_status *s) { - if (wt_status_submodule_summary == 0) return; + if (! wt_status_submodule_summary) return; struct child_process sm_summary; char summary_limit[64]; sprintf(summary_limit, "%d", wt_status_submodule_summary);
@@ -339,8 +339,6 @@ void wt_status_print(struct wt_status *s) } wt_status_print_changed(s); - // must flush s->fp since 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);