Skip to content

Commit e80065e

Browse files
committed
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 ff9db6c ("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 ff9db6c 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 ff9db6c and let git-gui work correctly in the supported configuration. Signed-off-by: Mark Levedahl <[email protected]>
1 parent b76a5a8 commit e80065e

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

git-gui.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -638,8 +638,6 @@ proc _lappend_nice {cmd_var} {
638638
set _nice [_which nice]
639639
if {[catch {safe_exec [list $_nice git version]}]} {
640640
set _nice {}
641-
} elseif {[is_Windows] && [file dirname $_nice] ne [file dirname $::_git]} {
642-
set _nice {}
643641
}
644642
}
645643
if {$_nice ne {}} {

0 commit comments

Comments
 (0)