summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-07-09 01:10:03 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-07-09 01:10:03 (GMT)
commit4ca131250c9e56efec638831d6157aaf4f130be9 (patch)
tree20bcc5c7494e6b411d0bf2c42249205fdf311506 /lib
parenta840566770c262f76e8fd7fb69239fbedd10b259 (diff)
parent88dce86f38bed84abadd73bbc40d9df92b7519db (diff)
downloadgit-4ca131250c9e56efec638831d6157aaf4f130be9.zip
git-4ca131250c9e56efec638831d6157aaf4f130be9.tar.gz
git-4ca131250c9e56efec638831d6157aaf4f130be9.tar.bz2
Merge branch 'maint'
* maint: git-gui: Skip nicknames when selecting author initials
Diffstat (limited to 'lib')
-rw-r--r--lib/blame.tcl4
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/blame.tcl b/lib/blame.tcl
index dcdb11b..76b5168 100644
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -556,6 +556,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