projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c2a70e7 5a8e7c3)
Merge branch 'mh/notes-tree-consolidate-fix' into next
authorJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:25:54 +0000 (14:25 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 30 Mar 2017 21:25:54 +0000 (14:25 -0700)
commit8383c6c088976c3058b851b780d4045d3b46738e
tree38f2ff49c0591cd0fd85f802f5d240c5039f7edatree | snapshot
parentc2a70e75825ac7c7f54f8cb0fff83ac7cf042a3acommit | diff
parent5a8e7c346672e399a6b6c0335a4435c7264a2a32commit | diff
Merge branch 'mh/notes-tree-consolidate-fix' into next

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()
Unnamed repository; edit this file 'description' to name the repository.