Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2017-05-30 20:30:42 +0300
committerJunio C Hamano <gitster@pobox.com>2017-06-02 03:36:06 +0300
commitbb7e4739712e3f9eee0dfd60088b6d8983067960 (patch)
treea6f1b9377836b010f44c4442ffb13a0afb584752 /notes-utils.c
parentfb61e4d3abe2349eb0fabe0be8981626b4074fa7 (diff)
builtin/notes: convert to struct object_id
Convert most of the static functions to use struct object_id. In addition, convert copy_notes_for_rewrite and its callers. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-utils.c')
-rw-r--r--notes-utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/notes-utils.c b/notes-utils.c
index 325ff3daa3..7d7c22b435 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -155,12 +155,12 @@ 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)
+ const struct object_id *from_obj, const struct object_id *to_obj)
{
int ret = 0;
int i;
for (i = 0; c->trees[i]; i++)
- ret = copy_note(c->trees[i], from_obj, to_obj, 1, c->combine) || ret;
+ ret = copy_note(c->trees[i], from_obj->hash, to_obj->hash, 1, c->combine) || ret;
return ret;
}