From: Mark Levedahl <mlevedahl@gmail.com>
Date: Tue, 20 May 2025 14:08:44 +0000 (-0400)
Subject: git-gui: let nice work on Windows
X-Git-Tag: v2.51.0-rc1~9^2~4^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e80065ecd700334fbc9f1de31320b83a894cfa06;p=thirdparty%2Fgit.git

git-gui: let nice work on Windows

git-gui runs blame and diff commands with nice by default. On Unix, nice
is accepted if found and it will run git. Commit ff9db6c79d ("On
Windows, avoid git-gui to call Cygwin's nice utility", 2010-10-05)
rejects nice if not collocated with git. In Git for Windows' (g4w) POSIX
path name space, nice and git are found in different directories:

	$ which git
	/mingw64/bin/git
	$ which nice
	/usr/bin/nice

Thus, git-gui will not use nice in the supported Windows configuration.
Commit ff9db6c79d justifies the collocation requirement as avoiding
problems in a mixed MSYS and Cygwin configuration: such configurations
are not supported by either project as they are known to cause many
problems.

So, let's revert ff9db6c79d and let git-gui work correctly in the
supported configuration.

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

diff --git a/git-gui.sh b/git-gui.sh
index 8d97817908..2b5b596400 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -638,8 +638,6 @@ proc _lappend_nice {cmd_var} {
 		set _nice [_which nice]
 		if {[catch {safe_exec [list $_nice git version]}]} {
 			set _nice {}
-		} elseif {[is_Windows] && [file dirname $_nice] ne [file dirname $::_git]} {
-			set _nice {}
 		}
 	}
 	if {$_nice ne {}} {