summaryrefslogtreecommitdiff
path: root/notes.c
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2010-03-12 17:04:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-13 05:55:39 (GMT)
commit160baa0d9cbdfcdb6251aa5ede77c59c0d53edfd (patch)
tree278241bc0737a69c78be1a15655ff05c66261a46 /notes.c
parentb079feed64238558fa24ba8ade892d84628a05ac (diff)
downloadgit-160baa0d9cbdfcdb6251aa5ede77c59c0d53edfd.zip
git-160baa0d9cbdfcdb6251aa5ede77c59c0d53edfd.tar.gz
git-160baa0d9cbdfcdb6251aa5ede77c59c0d53edfd.tar.bz2
notes: implement 'git notes copy --stdin'
This implements a mass-copy command that takes a sequence of lines in the format <from-sha1> SP <to-sha1> [ SP <rest> ] LF on stdin, and copies each <from-sha1>'s notes to the <to-sha1>. The <rest> is ignored. The intent, of course, is that this can read the same input that the 'post-rewrite' hook gets. The copy_note() function is exposed for everyone's and in particular the next commit's use. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Johan Herland <johan@herland.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes.c')
-rw-r--r--notes.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/notes.c b/notes.c
index 225a166..2feeb7b 100644
--- a/notes.c
+++ b/notes.c
@@ -1185,3 +1185,21 @@ void format_display_notes(const unsigned char *object_sha1,
format_note(display_notes_trees[i], object_sha1, sb,
output_encoding, flags);
}
+
+int copy_note(struct notes_tree *t,
+ const unsigned char *from_obj, const unsigned char *to_obj,
+ int force, combine_notes_fn combine_fn)
+{
+ const unsigned char *note = get_note(t, from_obj);
+ const unsigned char *existing_note = get_note(t, to_obj);
+
+ if (!force && existing_note)
+ return 1;
+
+ if (note)
+ add_note(t, to_obj, note, combine_fn);
+ else if (existing_note)
+ add_note(t, to_obj, null_sha1, combine_fn);
+
+ return 0;
+}