X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=notes-utils.c;h=9ebf8419565019cca42d778be96e2f3b7d6f29df;hb=e8906a9019799c0761ab5447b67582ffd9bae558;hp=325ff3daa37c5a0ce26c608b2e7bfd8a94b7f396;hpb=36dcb573374f267125a35a0d964707b527dd637d;p=git-core%2Fgit.git

diff --git a/notes-utils.c b/notes-utils.c
index 325ff3daa..9ebf84195 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -132,8 +132,11 @@ struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd)
 		c->mode_from_env = 1;
 		c->combine = parse_combine_notes_fn(rewrite_mode_env);
 		if (!c->combine)
-			/* TRANSLATORS: The first %s is the name of the
-			   environment variable, the second %s is its value */
+			/*
+			 * TRANSLATORS: The first %s is the name of
+			 * the environment variable, the second %s is
+			 * its value.
+			 */
 			error(_("Bad %s value: '%s'"), GIT_NOTES_REWRITE_MODE_ENVIRONMENT,
 					rewrite_mode_env);
 	}
@@ -155,7 +158,7 @@ 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;