diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-05-22 01:42:35 (GMT) |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-05-22 01:42:35 (GMT) |
| commit | f95c6780c244e90abf87222126ad3b4bb18a504e (patch) | |
| tree | ede18dbb8b33e330f3837209a489f7737df2dc25 /wt-status.c | |
| parent | 7df6ddf51ea71d81874ecfa34f670f50a3d45103 (diff) | |
| parent | 0ba956d331e4c14fb1600a62044492c6c27af71a (diff) | |
| download | git-f95c6780c244e90abf87222126ad3b4bb18a504e.zip git-f95c6780c244e90abf87222126ad3b4bb18a504e.tar.gz git-f95c6780c244e90abf87222126ad3b4bb18a504e.tar.bz2 | |
Merge branch 'maint-1.5.1' into maint
* maint-1.5.1:
git-status: respect core.excludesFile
SubmittingPatches: mention older C compiler compatibility
git-daemon: don't ignore pid-file write failure
Diffstat (limited to 'wt-status.c')
| -rw-r--r-- | wt-status.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/wt-status.c b/wt-status.c index a055990..4bfe8f1 100644 --- a/wt-status.c +++ b/wt-status.c @@ -22,6 +22,7 @@ static const char use_add_rm_msg[] = "use \"git add/rm <file>...\" to update what will be committed"; static const char use_add_to_include_msg[] = "use \"git add <file>...\" to include in what will be committed"; +static const char *excludes_file; static int parse_status_slot(const char *var, int offset) { @@ -259,6 +260,8 @@ static void wt_status_print_untracked(struct wt_status *s) x = git_path("info/exclude"); if (file_exists(x)) add_excludes_from_file(&dir, x); + if (excludes_file && file_exists(excludes_file)) + add_excludes_from_file(&dir, excludes_file); read_directory(&dir, ".", "", 0, NULL); for(i = 0; i < dir.nr; i++) { @@ -356,5 +359,11 @@ int git_status_config(const char *k, const char *v) int slot = parse_status_slot(k, 13); color_parse(v, k, wt_status_colors[slot]); } + if (!strcmp(k, "core.excludesfile")) { + if (!v) + die("core.excludesfile without value"); + excludes_file = xstrdup(v); + return 0; + } return git_default_config(k, v); } |