summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-07-29 07:22:27 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-07-29 07:22:27 (GMT)
commit94a4dd9bfda79a226f8dd57fd20c39c6603ec194 (patch)
treeaad7a9af0a3b232c7bc55ffa4fc859dcfc3b15a3
parent360cc106e76ea2a4ba424905c4924e9ed6a4165d (diff)
downloadgit-94a4dd9bfda79a226f8dd57fd20c39c6603ec194.zip
git-94a4dd9bfda79a226f8dd57fd20c39c6603ec194.tar.gz
git-94a4dd9bfda79a226f8dd57fd20c39c6603ec194.tar.bz2
git-gui: Honor core.excludesfile when listing extra files
Recent git versions have a git-status that honors the core.excludesfile configuration option when it reports on untracked files. Unfortunately I missed the introduction of this configuration option in the core porcelain implementation, so it was not reflected here in git-gui. Found and reported by Lars Noschinski <lars@public.noschinski.de>. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rwxr-xr-xgit-gui.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh
index d7fad46..4e3b58c 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -872,6 +872,10 @@ proc rescan_stage2 {fd after} {
if {[file readable $info_exclude]} {
lappend ls_others "--exclude-from=$info_exclude"
}
+ set user_exclude [get_config core.excludesfile]
+ if {$user_exclude ne {} && [file readable $user_exclude]} {
+ lappend ls_others "--exclude-from=$user_exclude"
+ }
set buf_rdi {}
set buf_rdf {}