diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:30 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-24 13:48:30 -0700 |
commit | 22d94a72b3c4fa7989c4827e84ebc364a200cd76 (patch) | |
tree | f71226003264e37bc59f505a542f5468292c460d /Makefile | |
parent | Merge branch 'fc/sequencer-plug-leak' (diff) | |
parent | Move create_notes_commit() from notes-merge.c into notes-utils.c (diff) | |
download | tgif-22d94a72b3c4fa7989c4827e84ebc364a200cd76.tar.xz |
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
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -696,6 +696,7 @@ LIB_H += merge-recursive.h 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-revindex.h @@ -830,6 +831,7 @@ LIB_OBJS += name-hash.o 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-revindex.o |