summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-01-29 08:03:29 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-01-29 08:03:29 (GMT)
commit463ca37b61b0d12aae8949c730bd38cc2149923f (patch)
treedcaa27c97091d7bfee440d709c24f582e3ac93c2
parentdb45378165f499dcc4412b4f4b0f4ec5cbc65914 (diff)
downloadgit-463ca37b61b0d12aae8949c730bd38cc2149923f.zip
git-463ca37b61b0d12aae8949c730bd38cc2149923f.tar.gz
git-463ca37b61b0d12aae8949c730bd38cc2149923f.tar.bz2
git-gui: Use -M and -C when running blame.
Since we run blame incrementally in the background we might as well get as much data as we can from the file. Adding -M and -C definately makes it take longer to compute the revision annotations, but since they are streamed in and updated as they are discovered we'll get recent data almost immediately anyway. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
-rwxr-xr-xgit-gui.sh4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-gui.sh b/git-gui.sh
index 09c1b74..d5490cd 100755
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -3276,7 +3276,9 @@ proc read_blame_catfile {fd w commit path texts w_lno w_file} {
if {[eof $fd]} {
close $fd
set blame_status($w) {Loading annotations...}
- set fd [open "| git blame --incremental $commit -- $path" r]
+ set cmd [list git blame -M -C --incremental]
+ lappend cmd $commit -- $path
+ set fd [open "| $cmd" r]
fconfigure $fd -blocking 0 -translation lf -encoding binary
fileevent $fd readable "read_blame_incremental $fd $w $texts"
}