mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Generate blame on uncommitted working tree file

Browse Source 
If the user doesn't give us a revision parameter to our blame
subcommand then we can generate blame against the working tree
file by passing the file path off to blame with the --contents
argument.  In this case we cannot obtain the contents of the
file from the ODB; instead we must obtain the contents by
reading the working directory file as-is.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce
2007-05-08 22:48:47 -04:00
parent 3e45ee1ef2
commit a0db0d61fb
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
git-gui.sh
View File

@ -1605,6 +1605,7 @@ browser {
}
blame {
set subcommand_args {rev? path?}
set head {}
set path {}
set is_path 0
foreach a $argv {
@ -1614,27 +1615,30 @@ blame {
break
} elseif {$a eq {--}} {
if {$path ne {}} {
if {$current_branch ne {}} usage
set current_branch $path
if {$head ne {}} usage
set head $path
set path {}
}
set is_path 1
} elseif {$current_branch eq {}} {
if {$current_branch ne {}} usage
set current_branch $a
} elseif {$head eq {}} {
if {$head ne {}} usage
set head $a
} else {
usage
}
}
unset is_path
if {$current_branch eq {} && $path ne {}} {
if {$head eq {}} {
set current_branch [git symbolic-ref HEAD]
regsub ^refs/((heads|tags|remotes)/)? \
$current_branch {} current_branch
} else {
set current_branch $head
}
if {$current_branch eq {} || $path eq {}} usage
blame::new $current_branch $path
if {$path eq {}} usage
blame::new $head $path
return
}
citool -