Update git-core to v2.50.0

glandium · glandium · commit c93344aec0cf · 2025-06-18T08:30:45.000+09:00
diff --git a/CI/tools.py b/CI/tools.py
@@ -16,7 +16,7 @@
 from util import build_commit
 
 MERCURIAL_VERSION = "6.9.1"
-GIT_VERSION = "2.49.0"
+GIT_VERSION = "2.50.0"
 
 ALL_MERCURIAL_VERSIONS = (
     "1.9.3",
diff --git a/git-core b/git-core
@@ -1 +1 @@
-Subproject commit cca1f38702730b35f52c29efd62864b85e85ddcc
+Subproject commit 311e67dc2479debe725dfb9a3f974bdce04644ea
diff --git a/src/cinnabar-fast-import.c b/src/cinnabar-fast-import.c
@@ -264,13 +264,13 @@ void do_set_replace(const struct object_id *replaced,
 	struct replace_object *replace;
 
 	if (is_null_oid(replace_with)) {
-		oidmap_remove(the_repository->objects->replace_map, replaced);
+		oidmap_remove(&the_repository->objects->replace_map, replaced);
 	} else {
 		struct replace_object *old;
 		replace = xmalloc(sizeof(*replace));
 		oidcpy(&replace->original.oid, replaced);
 		oidcpy(&replace->replacement, replace_with);
-		old = oidmap_put(the_repository->objects->replace_map, replace);
+		old = oidmap_put(&the_repository->objects->replace_map, replace);
 		if (old)
 			free(old);
 	}
@@ -547,7 +547,7 @@ void store_replace_map(struct object_id *result) {
 	struct oidmap_iter iter;
 	struct replace_object *replace;
 
-	oidmap_iter_init(the_repository->objects->replace_map, &iter);
+	oidmap_iter_init(&the_repository->objects->replace_map, &iter);
 	while ((replace = oidmap_iter_next(&iter))) {
 		strbuf_addf(&buf, "160000 %s%c",
 		            oid_to_hex(&replace->original.oid), '\0');
diff --git a/src/cinnabar-helper.c b/src/cinnabar-helper.c
@@ -67,7 +67,7 @@ struct rev_info *rev_list_new(int argc, const char **argv) {
 void rev_list_finish(struct rev_info *revs) {
 	// More extensive than reset_revision_walk(). Otherwise --boundary
 	// and pathspecs don't work properly.
-	clear_object_flags(ALL_REV_FLAGS | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE);
+	clear_object_flags(the_repository, ALL_REV_FLAGS | TOPO_WALK_EXPLORED | TOPO_WALK_INDEGREE);
 	release_revisions(revs);
 	free(revs);
 }
@@ -171,27 +171,24 @@ const struct object_id *repo_lookup_replace_object(
 
 void init_replace_map(void)
 {
-	the_repository->objects->replace_map =
-		xmalloc(sizeof(*the_repository->objects->replace_map));
-	oidmap_init(the_repository->objects->replace_map, 0);
+	oidmap_init(&the_repository->objects->replace_map, 0);
 	the_repository->objects->replace_map_initialized = 1;
 }
 
 void reset_replace_map(void)
 {
-	oidmap_free(the_repository->objects->replace_map, 1);
-	FREE_AND_NULL(the_repository->objects->replace_map);
+	oidmap_clear(&the_repository->objects->replace_map, 1);
 	the_repository->objects->replace_map_initialized = 0;
 }
 
 unsigned int replace_map_size(void)
 {
-	return hashmap_get_size(&the_repository->objects->replace_map->map);
+	return hashmap_get_size(&the_repository->objects->replace_map.map);
 }
 
 unsigned int replace_map_tablesize(void)
 {
-	return the_repository->objects->replace_map->map.tablesize;
+	return the_repository->objects->replace_map.map.tablesize;
 }
 
 static void init_git_config(void)
diff --git a/src/cinnabar-notes.c b/src/cinnabar-notes.c
@@ -133,7 +133,7 @@ int cinnabar_remove_note(struct cinnabar_notes_tree *t,
 	if (!result) {
 		struct object_id oid;
 		oidread(&oid, object_sha1, the_repository->hash_algo);
-		add_note(&t->additions, &oid, null_oid(), NULL);
+		add_note(&t->additions, &oid, null_oid(the_repository->hash_algo), NULL);
 	}
 	return result && result2;
 }
diff --git a/src/csum-file.c.patch b/src/csum-file.c.patch
@@ -1,8 +1,8 @@
 diff --git a/csum-file.c b/csum-file.c
-index 2131ee6b12..f31d551613 100644
+index 6e21e3cac8..1a4ea61237 100644
 --- a/csum-file.c
 +++ b/csum-file.c
-@@ -111,7 +111,8 @@ void discard_hashfile(struct hashfile *f)
+@@ -110,7 +110,8 @@ void discard_hashfile(struct hashfile *f)
  	free_hashfile(f);
  }
  
diff --git a/src/fast-import.c.patch b/src/fast-import.c.patch
@@ -1,5 +1,5 @@
 diff --git a/builtin/fast-import.c b/builtin/fast-import.c
-index 397a6f46ad..0ae561a80b 100644
+index b2839c5f43..1feeaf0ec1 100644
 --- a/builtin/fast-import.c
 +++ b/builtin/fast-import.c
 @@ -29,6 +29,7 @@
@@ -19,7 +19,7 @@ index 397a6f46ad..0ae561a80b 100644
  {
  	struct strbuf tmp_file = STRBUF_INIT;
  	struct packed_git *p;
-@@ -859,7 +860,7 @@ static int loosen_small_pack(const struct packed_git *p)
+@@ -860,7 +861,7 @@ static int loosen_small_pack(const struct packed_git *p)
  	return run_command(&unpack);
  }
  
@@ -28,15 +28,15 @@ index 397a6f46ad..0ae561a80b 100644
  {
  	static int running;
  
-@@ -878,6 +879,7 @@ static void end_packfile(void)
+@@ -879,6 +880,7 @@ static void end_packfile(void)
  
  		close_pack_windows(pack_data);
  		finalize_hashfile(pack_file, cur_pack_oid.hash, FSYNC_COMPONENT_PACK, 0);
 +		pack_file = NULL;
  		fixup_pack_header_footer(the_hash_algo, pack_data->pack_fd,
  					 pack_data->hash, pack_data->pack_name,
  					 object_count, cur_pack_oid.hash,
-@@ -977,6 +979,9 @@ static int store_object(
+@@ -978,6 +980,9 @@ static int store_object(
  		e->pack_id = MAX_PACK_ID;
  		e->idx.offset = 1; /* just not zero! */
  		duplicate_count_by_type[type]++;
diff --git a/src/http.c.patch b/src/http.c.patch
@@ -1,5 +1,5 @@
 diff --git a/http.c b/http.c
-index d5396a3ce2..2cfb042e53 100644
+index bf6889a30c..f7e2a585ff 100644
 --- a/http.c
 +++ b/http.c
 @@ -64,7 +64,7 @@ static char *ssl_key_type;
@@ -11,7 +11,7 @@ index d5396a3ce2..2cfb042e53 100644
  static long curl_low_speed_limit = -1;
  static long curl_low_speed_time = -1;
  static int curl_ftp_no_epsv;
-@@ -419,11 +419,13 @@ static int http_options(const char *var, const char *value,
+@@ -423,11 +423,13 @@ static int http_options(const char *var, const char *value,
  		curl_ssl_try = git_config_bool(var, value);
  		return 0;
  	}
@@ -25,78 +25,7 @@ index d5396a3ce2..2cfb042e53 100644
  
  	if (!strcmp("http.schannelcheckrevoke", var)) {
  		if (value && !strcmp(value, "best-effort")) {
-@@ -731,7 +733,7 @@ static int has_proxy_cert_password(void)
- 
- static void set_curl_keepalive(CURL *c)
- {
--	curl_easy_setopt(c, CURLOPT_TCP_KEEPALIVE, 1);
-+	curl_easy_setopt(c, CURLOPT_TCP_KEEPALIVE, 1L);
- }
- 
- /* Return 1 if redactions have been made, 0 otherwise. */
-@@ -1032,13 +1034,13 @@ static CURL *get_curl_handle(void)
- 		die("curl_easy_init failed");
- 
- 	if (!curl_ssl_verify) {
--		curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 0);
--		curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 0);
-+		curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 0L);
-+		curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 0L);
- 	} else {
- 		/* Verify authenticity of the peer's certificate */
--		curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 1);
-+		curl_easy_setopt(result, CURLOPT_SSL_VERIFYPEER, 1L);
- 		/* The name in the cert must match whom we tried to connect */
--		curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 2);
-+		curl_easy_setopt(result, CURLOPT_SSL_VERIFYHOST, 2L);
- 	}
- 
-     if (curl_http_version) {
-@@ -1141,8 +1143,8 @@ static CURL *get_curl_handle(void)
- 				 curl_low_speed_time);
- 	}
- 
--	curl_easy_setopt(result, CURLOPT_MAXREDIRS, 20);
--	curl_easy_setopt(result, CURLOPT_POSTREDIR, CURL_REDIR_POST_ALL);
-+	curl_easy_setopt(result, CURLOPT_MAXREDIRS, 20L);
-+	curl_easy_setopt(result, CURLOPT_POSTREDIR, (long)CURL_REDIR_POST_ALL);
- 
- #ifdef GIT_CURL_HAVE_CURLOPT_PROTOCOLS_STR
- 	{
-@@ -1175,7 +1177,7 @@ static CURL *get_curl_handle(void)
- 		user_agent ? user_agent : git_user_agent());
- 
- 	if (curl_ftp_no_epsv)
--		curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0);
-+		curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0L);
- 
- 	if (curl_ssl_try)
- 		curl_easy_setopt(result, CURLOPT_USE_SSL, CURLUSESSL_TRY);
-@@ -1217,18 +1219,18 @@ static CURL *get_curl_handle(void)
- 
- 		if (starts_with(curl_http_proxy, "socks5h"))
- 			curl_easy_setopt(result,
--				CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5_HOSTNAME);
-+				CURLOPT_PROXYTYPE, (long)CURLPROXY_SOCKS5_HOSTNAME);
- 		else if (starts_with(curl_http_proxy, "socks5"))
- 			curl_easy_setopt(result,
--				CURLOPT_PROXYTYPE, CURLPROXY_SOCKS5);
-+				CURLOPT_PROXYTYPE, (long)CURLPROXY_SOCKS5);
- 		else if (starts_with(curl_http_proxy, "socks4a"))
- 			curl_easy_setopt(result,
--				CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4A);
-+				CURLOPT_PROXYTYPE, (long)CURLPROXY_SOCKS4A);
- 		else if (starts_with(curl_http_proxy, "socks"))
- 			curl_easy_setopt(result,
--				CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
-+				CURLOPT_PROXYTYPE, (long)CURLPROXY_SOCKS4);
- 		else if (starts_with(curl_http_proxy, "https")) {
--			curl_easy_setopt(result, CURLOPT_PROXYTYPE, CURLPROXY_HTTPS);
-+			curl_easy_setopt(result, CURLOPT_PROXYTYPE, (long)CURLPROXY_HTTPS);
- 
- 			if (http_proxy_ssl_cert)
- 				curl_easy_setopt(result, CURLOPT_PROXY_SSLCERT, http_proxy_ssl_cert);
-@@ -1337,9 +1339,6 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
+@@ -1380,9 +1382,6 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
  		}
  	}
  
@@ -106,79 +35,11 @@ index d5396a3ce2..2cfb042e53 100644
  	if (proactive_auth && http_proactive_auth == PROACTIVE_AUTH_NONE)
  		http_proactive_auth = PROACTIVE_AUTH_IF_CREDENTIALS;
  
-@@ -1427,7 +1426,6 @@ void http_cleanup(void)
+@@ -1470,7 +1469,6 @@ void http_cleanup(void)
  	curl_easy_cleanup(curl_default);
  
  	curl_multi_cleanup(curlm);
 -	curl_global_cleanup();
  
  	string_list_clear(&extra_http_headers, 0);
  
-@@ -1533,9 +1531,9 @@ struct active_request_slot *get_active_slot(void)
- 	curl_easy_setopt(slot->curl, CURLOPT_WRITEFUNCTION, NULL);
- 	curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDS, NULL);
- 	curl_easy_setopt(slot->curl, CURLOPT_POSTFIELDSIZE, -1L);
--	curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 0);
--	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
--	curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 1);
-+	curl_easy_setopt(slot->curl, CURLOPT_UPLOAD, 0L);
-+	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1L);
-+	curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 1L);
- 	curl_easy_setopt(slot->curl, CURLOPT_RANGE, NULL);
- 
- 	/*
-@@ -1544,9 +1542,9 @@ struct active_request_slot *get_active_slot(void)
- 	 * HTTP_FOLLOW_* cases themselves.
- 	 */
- 	if (http_follow_config == HTTP_FOLLOW_ALWAYS)
--		curl_easy_setopt(slot->curl, CURLOPT_FOLLOWLOCATION, 1);
-+		curl_easy_setopt(slot->curl, CURLOPT_FOLLOWLOCATION, 1L);
- 	else
--		curl_easy_setopt(slot->curl, CURLOPT_FOLLOWLOCATION, 0);
-+		curl_easy_setopt(slot->curl, CURLOPT_FOLLOWLOCATION, 0L);
- 
- 	curl_easy_setopt(slot->curl, CURLOPT_IPRESOLVE, git_curl_ipresolve);
- 	curl_easy_setopt(slot->curl, CURLOPT_HTTPAUTH, http_auth_methods);
-@@ -2113,12 +2111,12 @@ static int http_request(const char *url,
- 	int ret;
- 
- 	slot = get_active_slot();
--	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1);
-+	curl_easy_setopt(slot->curl, CURLOPT_HTTPGET, 1L);
- 
- 	if (!result) {
--		curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1);
-+		curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 1L);
- 	} else {
--		curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0);
-+		curl_easy_setopt(slot->curl, CURLOPT_NOBODY, 0L);
- 		curl_easy_setopt(slot->curl, CURLOPT_WRITEDATA, result);
- 
- 		if (target == HTTP_REQUEST_FILE) {
-@@ -2144,7 +2142,7 @@ static int http_request(const char *url,
- 		strbuf_addstr(&buf, " no-cache");
- 	if (options && options->initial_request &&
- 	    http_follow_config == HTTP_FOLLOW_INITIAL)
--		curl_easy_setopt(slot->curl, CURLOPT_FOLLOWLOCATION, 1);
-+		curl_easy_setopt(slot->curl, CURLOPT_FOLLOWLOCATION, 1L);
- 
- 	headers = curl_slist_append(headers, buf.buf);
- 
-@@ -2163,7 +2161,7 @@ static int http_request(const char *url,
- 	curl_easy_setopt(slot->curl, CURLOPT_URL, url);
- 	curl_easy_setopt(slot->curl, CURLOPT_HTTPHEADER, headers);
- 	curl_easy_setopt(slot->curl, CURLOPT_ENCODING, "");
--	curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 0);
-+	curl_easy_setopt(slot->curl, CURLOPT_FAILONERROR, 0L);
- 
- 	ret = run_one_slot(slot, &results);
- 
-@@ -2743,7 +2741,7 @@ struct http_object_request *new_http_object_request(const char *base_url,
- 	freq->headers = object_request_headers();
- 
- 	curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEDATA, freq);
--	curl_easy_setopt(freq->slot->curl, CURLOPT_FAILONERROR, 0);
-+	curl_easy_setopt(freq->slot->curl, CURLOPT_FAILONERROR, 0L);
- 	curl_easy_setopt(freq->slot->curl, CURLOPT_WRITEFUNCTION, fwrite_sha1_file);
- 	curl_easy_setopt(freq->slot->curl, CURLOPT_ERRORBUFFER, freq->errorstr);
- 	curl_easy_setopt(freq->slot->curl, CURLOPT_URL, freq->url);
diff --git a/src/libgit.rs b/src/libgit.rs
@@ -222,7 +222,6 @@ pub struct object_info {
     sizep: *mut c_ulong,
     disk_sizep: *mut u64,
     delta_base_oid: *mut object_id,
-    type_name: *mut strbuf,
     contentp: *mut *mut c_void,
     whence: c_int, // In reality, it's an inline enum.
     // In reality, following is a union with one struct.
@@ -238,7 +237,6 @@ impl Default for object_info {
             sizep: std::ptr::null_mut(),
             disk_sizep: std::ptr::null_mut(),
             delta_base_oid: std::ptr::null_mut(),
-            type_name: std::ptr::null_mut(),
             contentp: std::ptr::null_mut(),
             whence: 0,
             u_packed_pack: std::ptr::null_mut(),
diff --git a/src/mingw.c b/src/mingw.c
@@ -6,6 +6,9 @@
 static inline void winansi_init(void) {}
 #define main cinnabar_main
 extern int cinnabar_main(int argc, const char *argv[]);
+#ifdef __clang__
+#pragma clang diagnostic ignored "-Wcomma"
+#endif
 #include "compat/mingw.c"
 #else
 typedef int make_pedantic_happy;
diff --git a/src/notes.c.patch b/src/notes.c.patch
@@ -1,8 +1,8 @@
 diff --git a/notes.c b/notes.c
-index f2805d51bb..edc4dd19e2 100644
+index 0a128f1de9..ac58055c7a 100644
 --- a/notes.c
 +++ b/notes.c
-@@ -417,11 +417,6 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
+@@ -422,11 +422,6 @@ static void load_subtree(struct notes_tree *t, struct leaf_node *subtree,
  
  		if (path_len == 2 * (hashsz - prefix_len)) {
  			/* This is potentially the remainder of the SHA-1 */
@@ -14,15 +14,15 @@ index f2805d51bb..edc4dd19e2 100644
  			if (hex_to_bytes(object_oid.hash + prefix_len, entry.path,
  					 hashsz - prefix_len))
  				goto handle_non_note; /* entry.path is not a SHA1 */
-@@ -728,6 +723,7 @@ struct write_each_note_data {
+@@ -735,6 +730,7 @@ struct write_each_note_data {
  	struct tree_write_stack *root;
  	struct non_note **nn_list;
  	struct non_note *nn_prev;
 +	unsigned int note_mode;
  };
  
  static int write_each_non_note_until(const char *note_path,
-@@ -759,7 +755,7 @@ static int write_each_note(const struct object_id *object_oid,
+@@ -766,7 +762,7 @@ static int write_each_note(const struct object_id *object_oid UNUSED,
  	struct write_each_note_data *d =
  		(struct write_each_note_data *) cb_data;
  	size_t note_path_len = strlen(note_path);
@@ -31,7 +31,7 @@ index f2805d51bb..edc4dd19e2 100644
  
  	if (note_path[note_path_len - 1] == '/') {
  		/* subtree entry */
-@@ -1169,7 +1165,10 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
+@@ -1190,7 +1186,10 @@ int for_each_note(struct notes_tree *t, int flags, each_note_fn fn,
  	return for_each_note_helper(t, t->root, 0, 0, flags, fn, cb_data);
  }
  
@@ -43,15 +43,15 @@ index f2805d51bb..edc4dd19e2 100644
  {
  	struct tree_write_stack root;
  	struct write_each_note_data cb_data;
-@@ -1187,6 +1186,7 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
+@@ -1208,6 +1207,7 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
  	cb_data.root = &root;
  	cb_data.nn_list = &(t->first_non_note);
  	cb_data.nn_prev = NULL;
 +	cb_data.note_mode = mode;
  
  	/* Write tree objects representing current notes tree */
  	flags = FOR_EACH_NOTE_DONT_UNPACK_SUBTREES |
-@@ -1199,6 +1199,11 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
+@@ -1220,6 +1220,11 @@ int write_notes_tree(struct notes_tree *t, struct object_id *result)
  	return ret;
  }
  
diff --git a/src/object-file.c.patch b/src/object-file.c.patch
diff --git a/src/packfile.c.patch b/src/packfile.c.patch
diff --git a/src/revision.c.patch b/src/revision.c.patch
diff --git a/src/run-command.c.patch b/src/run-command.c.patch

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ struct rev_info rev_list_new(int argc, const char *argv) {`
`67`	`67`	`void rev_list_finish(struct rev_info *revs) {`
`68`	`68`	`// More extensive than reset_revision_walk(). Otherwise --boundary`
`69`	`69`	`// and pathspecs don't work properly.`
`70`		`- clear_object_flags(ALL_REV_FLAGS \| TOPO_WALK_EXPLORED \| TOPO_WALK_INDEGREE);`
	`70`	`+ clear_object_flags(the_repository, ALL_REV_FLAGS \| TOPO_WALK_EXPLORED \| TOPO_WALK_INDEGREE);`
`71`	`71`	`release_revisions(revs);`
`72`	`72`	`free(revs);`
`73`	`73`	`}`
`@@ -171,27 +171,24 @@ const struct object_id *repo_lookup_replace_object(`
`171`	`171`
`172`	`172`	`void init_replace_map(void)`
`173`	`173`	`{`
`174`		`- the_repository->objects->replace_map =`
`175`		`- xmalloc(sizeof(*the_repository->objects->replace_map));`
`176`		`- oidmap_init(the_repository->objects->replace_map, 0);`
	`174`	`+ oidmap_init(&the_repository->objects->replace_map, 0);`
`177`	`175`	`the_repository->objects->replace_map_initialized = 1;`
`178`	`176`	`}`
`179`	`177`
`180`	`178`	`void reset_replace_map(void)`
`181`	`179`	`{`
`182`		`- oidmap_free(the_repository->objects->replace_map, 1);`
`183`		`- FREE_AND_NULL(the_repository->objects->replace_map);`
	`180`	`+ oidmap_clear(&the_repository->objects->replace_map, 1);`
`184`	`181`	`the_repository->objects->replace_map_initialized = 0;`
`185`	`182`	`}`
`186`	`183`
`187`	`184`	`unsigned int replace_map_size(void)`
`188`	`185`	`{`
`189`		`- return hashmap_get_size(&the_repository->objects->replace_map->map);`
	`186`	`+ return hashmap_get_size(&the_repository->objects->replace_map.map);`
`190`	`187`	`}`
`191`	`188`
`192`	`189`	`unsigned int replace_map_tablesize(void)`
`193`	`190`	`{`
`194`		`- return the_repository->objects->replace_map->map.tablesize;`
	`191`	`+ return the_repository->objects->replace_map.map.tablesize;`
`195`	`192`	`}`
`196`	`193`
`197`	`194`	`static void init_git_config(void)`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ int cinnabar_remove_note(struct cinnabar_notes_tree *t,`
`133`	`133`	`if (!result) {`
`134`	`134`	`struct object_id oid;`
`135`	`135`	`oidread(&oid, object_sha1, the_repository->hash_algo);`
`136`		`- add_note(&t->additions, &oid, null_oid(), NULL);`
	`136`	`+ add_note(&t->additions, &oid, null_oid(the_repository->hash_algo), NULL);`
`137`	`137`	`}`
`138`	`138`	`return result && result2;`
`139`	`139`	`}`