From: Stefan Naewe <stefan.naewe@googlemail.com>
Date: Fri, 10 Dec 2010 15:41:09 +0000 (+0000)
Subject: git-gui: use --exclude-standard to check for untracked files
X-Git-Tag: gitgui-0.14.0~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=673eb4a01f340e5b0be0776fd05d1e84766182a3;p=git.git

git-gui: use --exclude-standard to check for untracked files

This fixes git-gui failing to display untracked files that are listed
if core.excludefiles is set to ~/.gitexcludes

[PT: added expansion of core.excludesfile value by tcl]

Signed-off-by: Stefan Naewe <stefan.naewe@googlemail.com>
Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
---

diff --git a/git-gui.sh b/git-gui.sh
index c85a53c06..8c3cf6b85 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1448,13 +1448,17 @@ proc rescan_stage2 {fd after} {
 		close $fd
 	}
 
-	set ls_others [list --exclude-per-directory=.gitignore]
-	if {[have_info_exclude]} {
-		lappend ls_others "--exclude-from=[gitdir info exclude]"
-	}
-	set user_exclude [get_config core.excludesfile]
-	if {$user_exclude ne {} && [file readable $user_exclude]} {
-		lappend ls_others "--exclude-from=$user_exclude"
+	if {[package vsatisfies $::_git_version 1.6.3]} {
+		set ls_others [list --exclude-standard]
+	} else {
+		set ls_others [list --exclude-per-directory=.gitignore]
+		if {[have_info_exclude]} {
+			lappend ls_others "--exclude-from=[gitdir info exclude]"
+		}
+		set user_exclude [get_config core.excludesfile]
+		if {$user_exclude ne {} && [file readable $user_exclude]} {
+			lappend ls_others "--exclude-from=[file normalize $user_exclude]"
+		}
 	}
 
 	set buf_rdi {}