There is only one right solution.  If a useful function is buried in
builtin/*.o as a historical accident (i.e. it started its life as a
helper for that particular command, and nobody else used it from
outside so far) and that makes it impossible to use the function
from outside builtin/*.o, refactor the function and its callers and
move it to libgit.a.

Here goes...

...Johan

Johan Herland (3):
  finish_copy_notes_for_rewrite(): Let caller provide commit message
  Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
  Move create_notes_commit() from notes-merge.c into notes-utils.c

 Makefile         |   2 +
 builtin.h        |  16 ------
 builtin/commit.c |   3 +-
 builtin/notes.c  | 136 ++---------------------------------------------
 notes-merge.c    |  27 +---------
 notes-merge.h    |  14 -----
 notes-utils.c    | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 notes-utils.h    |  37 +++++++++++++
 8 files changed, 203 insertions(+), 189 deletions(-)
 create mode 100644 notes-utils.c
 create mode 100644 notes-utils.h

-- 
1.8.1.3.704.g33f7d4f