From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 15 Nov 2012 18:24:53 +0000 (-0800)
Subject: Merge branch 'mh/notes-string-list'
X-Git-Tag: v1.8.1-rc0~60
X-Git-Url: https://repo.or.cz/w/git.git/commitdiff_plain/6050b5bca0f6d94d1d171d60b64ace87651383a1

Merge branch 'mh/notes-string-list'

Improve the asymptotic performance of the cat_sort_uniq notes merge
strategy.

* mh/notes-string-list:
  string_list_add_refs_from_colon_sep(): use string_list_split()
  notes: fix handling of colon-separated values
  combine_notes_cat_sort_uniq(): sort and dedup lines all at once
  Initialize sort_uniq_list using named constant
  string_list: add a function string_list_remove_empty_items()
---

6050b5bca0f6d94d1d171d60b64ace87651383a1