diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2010-02-08 07:57:37 -0800 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2010-02-08 07:57:37 -0800 |
| commit | 2a9edd03057287cf7d69e5021eda2e0122684c92 (patch) | |
| tree | 795b45f435316515153e403a2dafa4665a9526aa | |
| parent | 89d61592bddda4dfcb90314be9e06479f712bb7f (diff) | |
| parent | 9c898a18ea37aa04a84c3a2d18794cf892862702 (diff) | |
| download | git-2a9edd03057287cf7d69e5021eda2e0122684c92.tar.gz | |
Merge branch 'maint'
* maint:
git-gui: check whether systems nice command works or disable it
| -rwxr-xr-x | git-gui.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/git-gui.sh b/git-gui.sh index 7d5451198c..8996d2d6bc 100755 --- 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 |