summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Stephen Boyd <bebarino@gmail.com>2009-11-19 11:44:46 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-11-19 23:02:30 -0800
commite42a05f75c9ff5d10d0b8f6784fc244873818a99 (patch)
tree7d3dca9a525b76d5dae38dc4b7ac93261f6b5818 /builtin-merge-recursive.c
parentgitweb: Minify gitweb.js if JSMIN is defined (diff)
downloadtgif-e42a05f75c9ff5d10d0b8f6784fc244873818a99.tar.xz
gitweb.js: fix null object exception in initials calculation
Currently handleLine() assumes that a commit author name will always start with a capital letter. It's possible that the author name is user@example.com and therefore calling a match() on the name will fail to return any matches. Subsequently joining these matches will cause an exception. Fix by checking that we have a match before trying to join the results into a set of initials for the author. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions