diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-07-12 01:45:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-12 01:45:56 -0700 |
| commit | 1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5 (patch) | |
| tree | 19c5485ad50623c4c44d9268fdfa5afa98bd2619 /git-gui/lib/blame.tcl | |
| parent | Clarify documentation of fast-import's D subcommand (diff) | |
| parent | git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree} (diff) | |
| download | tgif-1b2782a5e2f88bf5e6e2cbb58e54fea015e21af5.tar.xz | |
Merge branch 'maint' of git://repo.or.cz/git-gui into maint
* 'maint' of git://repo.or.cz/git-gui:
git-gui: Work around bad interaction between Tcl and cmd.exe on ^{tree}
git-gui: Don't linewrap within console windows
git-gui: Correct ls-tree buffering problem in browser
git-gui: Skip nicknames when selecting author initials
git-gui: Ensure windows shortcuts always have .bat extension
git-gui: Include a Push action on the left toolbar
git-gui: Bind M1-P to push action
git-gui: Don't bind F5/M1-R in all windows
git-gui: Unlock the index when cancelling merge dialog
git-gui: properly popup error if gitk should be started but is not installed
Diffstat (limited to 'git-gui/lib/blame.tcl')
| -rw-r--r-- | git-gui/lib/blame.tcl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/git-gui/lib/blame.tcl b/git-gui/lib/blame.tcl index b523654815..1d2caac283 100644 --- a/git-gui/lib/blame.tcl +++ b/git-gui/lib/blame.tcl @@ -547,6 +547,10 @@ method _read_blame {fd cur_w cur_d cur_s} { set a_name {} catch {set a_name $header($cmit,author)} while {$a_name ne {}} { + if {$author_abbr ne {} + && [string index $a_name 0] eq {'}} { + regsub {^'[^']+'\s+} $a_name {} a_name + } if {![regexp {^([[:upper:]])} $a_name _a]} break append author_abbr $_a unset _a |