Code

Merge branch 'jh/fast-import-notes' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:35 +0000 (11:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 28 Dec 2011 19:32:35 +0000 (11:32 -0800)
commit9ddb7ead5234d3a40f7222df482c9ec46f5413c9
tree099ee55cd4cd998182c2867c251c5cd939f6cbe0
parentd9d73b37f34e2e366357b99a6ac74a09681b0ab8
parent183868578049f5a28f7166716a4b00768d148958
Merge branch 'jh/fast-import-notes' into maint

* 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