summaryrefslogtreecommitdiff
path: root/builtin.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-24 13:48:30 -0700
committerJunio C Hamano <gitster@pobox.com>2013-06-24 13:48:30 -0700
commit22d94a72b3c4fa7989c4827e84ebc364a200cd76 (patch)
treef71226003264e37bc59f505a542f5468292c460d /builtin.h
parent0039d60c3fdf0e01ad7e6fce59b2522764f2edc8 (diff)
parentbf9a05ba46a9d464424d22482aaa54abdd28b77d (diff)
downloadgit-22d94a72b3c4fa7989c4827e84ebc364a200cd76.tar.gz
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 'builtin.h')
-rw-r--r--builtin.h16
1 files changed, 0 insertions, 16 deletions
diff --git a/builtin.h b/builtin.h
index 64bab6bf54..1ed8edb0cb 100644
--- a/builtin.h
+++ b/builtin.h
@@ -5,7 +5,6 @@
#include "strbuf.h"
#include "cache.h"
#include "commit.h"
-#include "notes.h"
#define DEFAULT_MERGE_LOG_LEN 20
@@ -26,21 +25,6 @@ struct fmt_merge_msg_opts {
extern int fmt_merge_msg(struct strbuf *in, struct strbuf *out,
struct fmt_merge_msg_opts *);
-struct notes_rewrite_cfg {
- struct notes_tree **trees;
- const char *cmd;
- int enabled;
- combine_notes_fn combine;
- struct string_list *refs;
- int refs_from_env;
- int mode_from_env;
-};
-
-struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd);
-int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
- const unsigned char *from_obj, const unsigned char *to_obj);
-void finish_copy_notes_for_rewrite(struct notes_rewrite_cfg *c);
-
extern int textconv_object(const char *path, unsigned mode, const unsigned char *sha1, int sha1_valid, char **buf, unsigned long *buf_size);
extern int cmd_add(int argc, const char **argv, const char *prefix);