From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ping Yin Subject: [PATCH v2 2/5] builtin-status: submodule summary support Date: Fri, 14 Mar 2008 23:28:38 +0800 Message-ID: <1205508521-7407-3-git-send-email-pkufranky@gmail.com> References: <1205508521-7407-1-git-send-email-pkufranky@gmail.com> <1205508521-7407-2-git-send-email-pkufranky@gmail.com> Cc: git@vger.kernel.org, Ping Yin To: gitster@pobox.com X-From: git-owner@vger.kernel.org Fri Mar 14 16:29:40 2008 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1JaBqb-0003VC-7J for gcvg-git-2@gmane.org; Fri, 14 Mar 2008 16:29:29 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753313AbYCNP2w (ORCPT ); Fri, 14 Mar 2008 11:28:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753845AbYCNP2w (ORCPT ); Fri, 14 Mar 2008 11:28:52 -0400 Received: from mail.qikoo.org ([60.28.205.235]:50526 "EHLO mail.qikoo.org" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753313AbYCNP2q (ORCPT ); Fri, 14 Mar 2008 11:28:46 -0400 Received: by mail.qikoo.org (Postfix, from userid 1029) id 3213C470AF; Fri, 14 Mar 2008 23:28:41 +0800 (CST) X-Mailer: git-send-email 1.5.4.4.653.g7cf1e In-Reply-To: <1205508521-7407-2-git-send-email-pkufranky@gmail.com> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: This commit teaches 'git commit/status' show 'Modified submodules' section given by 'git submodule summary --cached --for-status' just before 'Untracked files' section. Signed-off-by: Ping Yin --- wt-status.c | 26 ++++++++++++++++++++++++++ 1 files changed, 26 insertions(+), 0 deletions(-) diff --git a/wt-status.c b/wt-status.c index b3fd57b..dc4a88f 100644 --- a/wt-status.c +++ b/wt-status.c @@ -8,6 +8,7 @@ #include "revision.h" #include "diffcore.h" #include "quote.h" +#include "run-command.h" int wt_status_relative_paths = 1; int wt_status_use_color = -1; @@ -219,6 +220,30 @@ static void wt_status_print_changed(struct wt_status *s) rev.diffopt.format_callback_data = 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", + "--for-status", + 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 */ + run_command(&sm_summary); +} static void wt_status_print_untracked(struct wt_status *s) { @@ -308,6 +333,7 @@ void wt_status_print(struct wt_status *s) } wt_status_print_changed(s); + wt_status_print_submodule_summary(s); wt_status_print_untracked(s); if (s->verbose && !s->is_initial) -- 1.5.4.4.653.g7cf1e