Merge branch 'maint'

* maint: git-gui: check whether systems nice command works or disable it
2010-02-08 07:57:37 -08:00 · 2010-02-08 07:57:37 -08:00 · 2a9edd0305
commit 2a9edd0305
parent 89d61592bd 9c898a18ea
1 changed files with 3 additions and 0 deletions
--- a/git-gui.sh
+++ b/git-gui.sh
@ -416,6 +416,9 @@ proc _lappend_nice {cmd_var} {

 	if {![info exists _nice]} {
 		set _nice [_which nice]
+		if {[catch {exec $_nice git version}]} {
+			set _nice {}
+		}
 	}
 	if {$_nice ne {}} {
 		lappend cmd $_nice