diff options
| author |  Shawn O. Pearce <spearce@spearce.org> | 2007-06-27 00:36:38 -0400 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2007-06-27 00:36:38 -0400 |
| commit | 03d25622a5c0f8d0fc4030f3114974d86f20fd61 (patch) | |
| tree | 4fbe35cd50e671e27635843e3474e3b1e4da2706 /lib | |
| parent | Merge branch 'maint' (diff) | |
| parent | git-gui: Don't require a .pvcsrc to create Tools/Migrate menu hack (diff) | |
| download | tgif-03d25622a5c0f8d0fc4030f3114974d86f20fd61.tar.xz | |
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.tcl | 6 |
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 {}} { |