git-gui: simplify PATH de-duplication

mark987 · j6t · commit e369dbeb794a · 2025-08-21T20:35:26.000+02:00
git-gui since 8fe7861 ("git-gui: assure PATH has only absolute elements.", 2025-04-11) uses a list to maintain order and a dict to detect duplicated elements without quadratic complexity. But, Tcl's dict explicitly maintains keys in the order first added, thus the list is not needed. Simplify the code. Signed-off-by: Mark Levedahl <mlevedahl@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org>
diff --git a/git-gui.sh b/git-gui.sh
@@ -103,7 +103,6 @@ if {[is_Windows]} {
 	set _path_sep {:}
 }
 
-set _search_path {}
 set _path_seen [dict create]
 foreach p [split $env(PATH) $_path_sep] {
 	# Keep only absolute paths, getting rid of ., empty, etc.
@@ -112,12 +111,9 @@ foreach p [split $env(PATH) $_path_sep] {
 	}
 	# Keep only the first occurence of any duplicates.
 	set norm_p [file normalize $p]
-	if {[dict exists $_path_seen $norm_p]} {
-		continue
-	}
 	dict set _path_seen $norm_p 1
-	lappend _search_path $norm_p
 }
+set _search_path [dict keys $_path_seen]
 unset _path_seen
 
 set env(PATH) [join $_search_path $_path_sep]

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,6 @@ if {[is_Windows]} {`
`103`	`103`	`set _path_sep {:}`
`104`	`104`	`}`
`105`	`105`
`106`		`-set _search_path {}`
`107`	`106`	`set _path_seen [dict create]`
`108`	`107`	`foreach p [split $env(PATH) $_path_sep] {`
`109`	`108`	`# Keep only absolute paths, getting rid of ., empty, etc.`
`@@ -112,12 +111,9 @@ foreach p [split $env(PATH) $_path_sep] {`
`112`	`111`	`}`
`113`	`112`	`# Keep only the first occurence of any duplicates.`
`114`	`113`	`set norm_p [file normalize $p]`
`115`		`- if {[dict exists $_path_seen $norm_p]} {`
`116`		`- continue`
`117`		`- }`
`118`	`114`	`dict set _path_seen $norm_p 1`
`119`		`- lappend _search_path $norm_p`
`120`	`115`	`}`
	`116`	`+set _search_path [dict keys $_path_seen]`
`121`	`117`	`unset _path_seen`
`122`	`118`
`123`	`119`	`set env(PATH) [join $_search_path $_path_sep]`