summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Shawn O. Pearce <spearce@spearce.org>2007-06-27 00:27:13 -0400
committerLibravatar Shawn O. Pearce <spearce@spearce.org>2007-06-27 00:27:13 -0400
commitfffaaba3588b0da14f4e3265540d400859aad49e (patch)
treeaf54840589fac0cdbac86d36087ed26b348d34cb
parentgit-gui: Don't require $DISPLAY just to get --version (diff)
downloadtgif-fffaaba3588b0da14f4e3265540d400859aad49e.tar.xz
git-gui: Don't nice git blame on MSYS as nice is not supported
Johannes Sixt reported that MinGW/MSYS does not have a nice.exe to drop the priority of a child process when it gets spawned. So we have to avoid trying to start `git blame` through nice when we are on Windows and do not have Cygwin available to us. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rw-r--r--lib/blame.tcl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/blame.tcl b/lib/blame.tcl
index 076233c3c3..b523654815 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 {}} {