Merge branch 'jh/fast-import-notes'
authorJunio C Hamano <gitster@pobox.com>
Sat, 17 Dec 2011 06:33:34 +0000 (22:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 17 Dec 2011 06:33:34 +0000 (22:33 -0800)
commite9bba5340e1ba370bb2f64a514c87fdaf417d6d7
treeb49fc2cf8f3507e11e50c663948a92e693e7f899
parent0bbaa5c076f51a0eb3ab4f53bbc5a32ce66cf954
parent183868578049f5a28f7166716a4b00768d148958
Merge branch 'jh/fast-import-notes'

* jh/fast-import-notes:
  fast-import: Fix incorrect fanout level when modifying existing notes refs
  t9301: Add 2nd testcase exposing bugs in fast-import's notes fanout handling
  t9301: Fix testcase covering up a bug in fast-import's notes fanout handling