From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Jun 2013 20:48:30 +0000 (-0700)
Subject: Merge branch 'jh/libify-note-handling'
X-Git-Tag: v1.8.4-rc0~140
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=22d94a72b3c4fa7989c4827e84ebc364a200cd76;p=git

Merge branch 'jh/libify-note-handling'

Make it possible to call into copy-notes API from the sequencer code.

* jh/libify-note-handling:
  Move create_notes_commit() from notes-merge.c into notes-utils.c
  Move copy_note_for_rewrite + friends from builtin/notes.c to notes-utils.c
  finish_copy_notes_for_rewrite(): Let caller provide commit message
---

22d94a72b3c4fa7989c4827e84ebc364a200cd76
diff --cc Makefile
index 79f961ee4b,22deee10c8..e1583761df
--- a/Makefile
+++ b/Makefile
@@@ -696,8 -682,10 +696,9 @@@ LIB_H += merge-recursive.
  LIB_H += mergesort.h
  LIB_H += notes-cache.h
  LIB_H += notes-merge.h
+ LIB_H += notes-utils.h
  LIB_H += notes.h
  LIB_H += object.h
 -LIB_H += pack-refs.h
  LIB_H += pack-revindex.h
  LIB_H += pack.h
  LIB_H += parse-options.h
@@@ -830,8 -816,10 +831,9 @@@ LIB_OBJS += name-hash.
  LIB_OBJS += notes.o
  LIB_OBJS += notes-cache.o
  LIB_OBJS += notes-merge.o
+ LIB_OBJS += notes-utils.o
  LIB_OBJS += object.o
  LIB_OBJS += pack-check.o
 -LIB_OBJS += pack-refs.o
  LIB_OBJS += pack-revindex.o
  LIB_OBJS += pack-write.o
  LIB_OBJS += pager.o