From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 5/5] status: --ignored option shows ignored files
Date: Sat, 10 Apr 2010 00:40:56 -0700 [thread overview]
Message-ID: <1270885256-31589-6-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1270885256-31589-1-git-send-email-gitster@pobox.com>
There is no stronger reason behind the choice of "!!" than just I happened
to have typed them.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
builtin/commit.c | 6 +++++-
wt-status.c | 22 +++++++++++++++-------
2 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/builtin/commit.c b/builtin/commit.c
index c5ab683..761ca07 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -83,6 +83,7 @@ static enum {
static char *cleanup_arg;
static int use_editor = 1, initial_commit, in_merge, include_status = 1;
+static int show_ignored_in_status;
static const char *only_include_assumed;
static struct strbuf message;
@@ -1031,6 +1032,8 @@ int cmd_status(int argc, const char **argv, const char *prefix)
"mode",
"show untracked files, optional modes: all, normal, no. (Default: all)",
PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
+ OPT_BOOLEAN(0, "ignored", &show_ignored_in_status,
+ "show ignored files"),
OPT_END(),
};
@@ -1044,7 +1047,8 @@ int cmd_status(int argc, const char **argv, const char *prefix)
builtin_status_options,
builtin_status_usage, 0);
handle_untracked_files_arg(&s);
-
+ if (show_ignored_in_status)
+ s.show_ignored_files = 1;
if (*argv)
s.pathspec = get_pathspec(prefix, argv);
diff --git a/wt-status.c b/wt-status.c
index 2c9a05d..7bda995 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -646,9 +646,11 @@ void wt_status_print(struct wt_status *s)
wt_status_print_submodule_summary(s, 0); /* staged */
wt_status_print_submodule_summary(s, 1); /* unstaged */
}
- if (s->show_untracked_files)
+ if (s->show_untracked_files) {
wt_status_print_other(s, &s->untracked, "Untracked", "add");
- else if (s->commitable)
+ if (s->show_ignored_files)
+ wt_status_print_other(s, &s->ignored, "Ignored", "add -f");
+ } else if (s->commitable)
fprintf(s->fp, "# Untracked files not listed (use -u option to show untracked files)\n");
if (s->verbose)
@@ -730,16 +732,16 @@ static void wt_shortstatus_status(int null_termination, struct string_list_item
}
}
-static void wt_shortstatus_untracked(int null_termination, struct string_list_item *it,
- struct wt_status *s)
+static void wt_shortstatus_other(int null_termination, struct string_list_item *it,
+ struct wt_status *s, const char *sign)
{
if (null_termination) {
- fprintf(stdout, "?? %s%c", it->string, 0);
+ fprintf(stdout, "%s %s%c", sign, it->string, 0);
} else {
struct strbuf onebuf = STRBUF_INIT;
const char *one;
one = quote_path(it->string, -1, &onebuf, s->prefix);
- color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), "??");
+ color_fprintf(s->fp, color(WT_STATUS_UNTRACKED, s), sign);
printf(" %s\n", one);
strbuf_release(&onebuf);
}
@@ -763,7 +765,13 @@ void wt_shortstatus_print(struct wt_status *s, int null_termination)
struct string_list_item *it;
it = &(s->untracked.items[i]);
- wt_shortstatus_untracked(null_termination, it, s);
+ wt_shortstatus_other(null_termination, it, s, "??");
+ }
+ for (i = 0; i < s->ignored.nr; i++) {
+ struct string_list_item *it;
+
+ it = &(s->ignored.items[i]);
+ wt_shortstatus_other(null_termination, it, s, "!!");
}
}
--
1.7.1.rc0.264.g94f6e
next prev parent reply other threads:[~2010-04-10 7:41 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-04-09 18:46 git status --porcelain is a mess that needs fixing Eric Raymond
2010-04-09 20:30 ` Junio C Hamano
2010-04-10 4:09 ` Jeff King
2010-04-10 5:46 ` Jonathan Nieder
2010-04-10 5:51 ` Jonathan Nieder
2010-04-10 6:03 ` Jeff King
2010-04-10 6:12 ` Jonathan Nieder
2010-04-10 6:32 ` Jeff King
2010-04-10 5:59 ` Eric Raymond
2010-04-10 7:40 ` [PATCH 0/5] "status --ignored" Junio C Hamano
2010-04-10 7:40 ` [PATCH 1/5] wt-status: remove unused workdir_untracked field Junio C Hamano
2010-04-10 7:40 ` [PATCH 2/5] wt-status: plug memory leak while collecting untracked files Junio C Hamano
2010-04-10 7:40 ` [PATCH 3/5] wt-status: collect ignored files Junio C Hamano
2010-04-10 7:48 ` Jeff King
2010-04-10 7:40 ` [PATCH 4/5] wt-status: rename and restructure status-print-untracked Junio C Hamano
2010-04-10 7:40 ` Junio C Hamano [this message]
2010-04-10 7:44 ` [PATCH 0/5] "status --ignored" Jeff King
2010-04-10 7:48 ` Junio C Hamano
2010-04-10 8:40 ` Jeff King
2010-04-10 14:41 ` Eric Raymond
2010-04-10 18:27 ` Junio C Hamano
2010-04-10 19:20 ` Jakub Narebski
2010-04-11 10:35 ` Jeff King
2010-04-10 13:35 ` git status --porcelain is a mess that needs fixing Julian Phillips
2010-04-10 14:43 ` Eric Raymond
2010-04-10 14:56 ` Jon Seymour
2010-04-10 15:50 ` Julian Phillips
2010-04-10 23:33 ` Jon Seymour
2010-04-10 19:25 ` [RFC/PATCH] status: Add a new NUL separated output format Julian Phillips
2010-04-10 19:50 ` Eric Raymond
2010-04-10 20:34 ` Julian Phillips
2010-04-10 21:12 ` Eric Raymond
2010-04-10 23:03 ` [RFC/PATCH] status: Add json " Julian Phillips
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1270885256-31589-6-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).