From: Mark Levedahl <mlevedahl@gmail.com>
Date: Sat, 5 Apr 2025 14:18:06 +0000 (-0400)
Subject: git-gui: git ls-files knows --exclude-standard
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dd7eb2d0370e0b610bcc05ab0843523c61b64c93;p=thirdparty%2Fgit.git

git-gui: git ls-files knows --exclude-standard

git-gui includes code to implement ls-files for git versions prior to
1.63 that did not know --exclude-standard. But, git-gui now requires git
version >= 2.36, so remove the obsolete code.

Signed-off-by: Mark Levedahl <mlevedahl@gmail.com>
---

diff --git a/git-gui.sh b/git-gui.sh
index d896382b8c..d5c8d2dc85 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -1536,18 +1536,7 @@ proc rescan_stage2 {fd after} {
 		close $fd
 	}
 
-	if {[package vcompare $::_git_version 1.6.3] >= 0} {
-		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 ls_others [list --exclude-standard]
 
 	set buf_rdi {}
 	set buf_rdf {}