Actually, teach runstatus what to do if it is not passed; it should not list
the contents of completely untracked directories, but only the name of that
directory (plus a trailing '/').
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@xxxxxx>
---
builtin-runstatus.c | 2 ++
git-commit.sh | 3 ++-
wt-status.c | 3 +++
wt-status.h | 1 +
4 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/builtin-runstatus.c b/builtin-runstatus.c
index 7979d61..303c556 100644
--- a/builtin-runstatus.c
+++ b/builtin-runstatus.c
@@ -25,6 +25,8 @@ int cmd_runstatus(int argc, const char *
}
else if (!strcmp(argv[i], "--verbose"))
s.verbose = 1;
+ else if (!strcmp(argv[i], "--untracked"))
+ s.untracked = 1;
else
usage(runstatus_usage);
}
diff --git a/git-commit.sh b/git-commit.sh
index 10c269a..5a4c659 100755
--- a/git-commit.sh
+++ b/git-commit.sh
@@ -82,7 +82,8 @@ run_status () {
esac
git-runstatus ${color} \
${verbose:+--verbose} \
- ${amend:+--amend}
+ ${amend:+--amend} \
+ ${untracked_files:+--untracked}
}
trap '
diff --git a/wt-status.c b/wt-status.c
index ec2c728..4398f9b 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -50,6 +50,7 @@ void wt_status_prepare(struct wt_status
s->amend = 0;
s->verbose = 0;
s->commitable = 0;
+ s->untracked = 0;
}
static void wt_status_print_header(const char *main, const char *sub)
@@ -188,6 +189,8 @@ static void wt_status_print_untracked(co
memset(&dir, 0, sizeof(dir));
dir.exclude_per_dir = ".gitignore";
+ if (!s->untracked)
+ dir.show_other_directories = 1;
x = git_path("info/exclude");
if (file_exists(x))
add_excludes_from_file(&dir, x);
diff --git a/wt-status.h b/wt-status.h
index 75d3cfe..0a5a5b7 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -15,6 +15,7 @@ struct wt_status {
int commitable;
int verbose;
int amend;
+ int untracked;
};
int git_status_config(const char *var, const char *value);
--
1.4.2.g1734-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