summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-06-27 04:36:38 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-06-27 04:36:38 (GMT)
commit03d25622a5c0f8d0fc4030f3114974d86f20fd61 (patch)
tree4fbe35cd50e671e27635843e3474e3b1e4da2706 /lib
parentfe813d4e80426971ce17f6ea03f97bc1e26383a1 (diff)
parent7e508eb1a2efce72be1651a35ab3150bfa3c88d6 (diff)
downloadgit-03d25622a5c0f8d0fc4030f3114974d86f20fd61.zip
git-03d25622a5c0f8d0fc4030f3114974d86f20fd61.tar.gz
git-03d25622a5c0f8d0fc4030f3114974d86f20fd61.tar.bz2
Merge branch 'maint'
* maint: git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack git-gui: Don't nice git blame on MSYS as nice is not supported git-gui: Don't require $DISPLAY just to get --version
Diffstat (limited to 'lib')
-rw-r--r--lib/blame.tcl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/blame.tcl b/lib/blame.tcl
index 076233c..b523654 100644
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -487,7 +487,11 @@ method _read_file {fd jump} {
} ifdeleted { catch {close $fd} }
method _exec_blame {cur_w cur_d options cur_s} {
- set cmd [list nice git blame]
+ set cmd [list]
+ if {![is_Windows] || [is_Cygwin]} {
+ lappend cmd nice
+ }
+ lappend cmd git blame
set cmd [concat $cmd $options]
lappend cmd --incremental
if {$commit eq {}} {