From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Mar 2017 21:07:17 +0000 (-0700)
Subject: Merge branch 'mh/notes-tree-consolidate-fix'
X-Git-Tag: v2.13.0-rc0~37
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd49f9bfb8c23621f618d110f2b95853728be2ba;p=thirdparty%2Fgit.git

Merge branch 'mh/notes-tree-consolidate-fix'

Removing an entry from a notes tree and then looking another note
entry from the resulting tree using the internal notes API
functions did not work as expected.  No in-tree users of the API
has such access pattern, but it still is worth fixing.

* mh/notes-tree-consolidate-fix:
  notes: do not break note_tree structure in note_tree_consolidate()
---

cd49f9bfb8c23621f618d110f2b95853728be2ba