@@ Commit message
  ## GIT-VERSION-GEN ##
 @@
  
- DEF_VER=v2.50.GIT
+ DEF_VER=v2.51.0-rc1
  
 +# Identify microsoft/git via a distinct version suffix
 +DEF_VER=$DEF_VER.vfs.0.0

@@ object-file.c
  #include "hex.h"
  #include "loose.h"
  #include "object-file-convert.h"
-@@ object-file.c: static int check_and_freshen_nonlocal(const struct object_id *oid, int freshen)
- 
- static int check_and_freshen(const struct object_id *oid, int freshen)
+@@ object-file.c: static int check_and_freshen_source(struct odb_source *source,
+ 				    int freshen)
  {
--	return check_and_freshen_local(oid, freshen) ||
-+	int ret;
-+	int tried_hook = 0;
+ 	static struct strbuf path = STRBUF_INIT;
++	int ret, tried_hook = 0;
 +
+ 	odb_loose_path(source, &path, oid);
+-	return check_and_freshen_file(path.buf, freshen);
 +retry:
-+	ret = check_and_freshen_local(oid, freshen) ||
- 	       check_and_freshen_nonlocal(oid, freshen);
-+	if (!ret && gvfs_virtualize_objects(the_repository) && !tried_hook) {
++	ret = check_and_freshen_file(path.buf, freshen);
++	if (!ret && gvfs_virtualize_objects(source->odb->repo) && !tried_hook) {
 +		tried_hook = 1;
-+		if (!read_object_process(the_repository, oid))
++		if (!read_object_process(source->odb->repo, oid))
 +			goto retry;
 +	}
-+
 +	return ret;
  }
  
- int has_loose_object_nonlocal(const struct object_id *oid)
+ int has_loose_object(struct odb_source *source,
 
  ## odb.c ##
 @@
@@ odb.c: static int do_oid_object_info_extended(struct object_database *odb,
  		}
 
  ## odb.h ##
-@@ odb.h: enum for_each_object_flags {
- 	FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS = (1<<4),
- };
+@@ odb.h: static inline int odb_write_object(struct object_database *odb,
+ 	return odb_write_object_ext(odb, buf, len, type, oid, NULL, 0);
+ }
  
 +int read_object_process(struct repository *r, const struct object_id *oid);
 +

@@ Commit message
     Signed-off-by: Johannes Schindelin <[email protected]>
 
  ## object-file.c ##
-@@ object-file.c: static int check_and_freshen_nonlocal(const struct object_id *oid, int freshen)
- 	return 0;
- }
+@@ object-file.c: int check_and_freshen_file(const char *fn, int freshen)
  
--static int check_and_freshen(const struct object_id *oid, int freshen)
-+static int check_and_freshen(const struct object_id *oid, int freshen,
-+			     int skip_virtualized_objects)
+ static int check_and_freshen_source(struct odb_source *source,
+ 				    const struct object_id *oid,
+-				    int freshen)
++				    int freshen, int skip_virtualized_objects)
  {
- 	int ret;
- 	int tried_hook = 0;
-@@ object-file.c: static int check_and_freshen(const struct object_id *oid, int freshen)
+ 	static struct strbuf path = STRBUF_INIT;
+ 	int ret, tried_hook = 0;
+@@ object-file.c: static int check_and_freshen_source(struct odb_source *source,
+ 	odb_loose_path(source, &path, oid);
  retry:
- 	ret = check_and_freshen_local(oid, freshen) ||
- 	       check_and_freshen_nonlocal(oid, freshen);
--	if (!ret && gvfs_virtualize_objects(the_repository) && !tried_hook) {
-+	if (!ret && gvfs_virtualize_objects(the_repository) &&
+ 	ret = check_and_freshen_file(path.buf, freshen);
+-	if (!ret && gvfs_virtualize_objects(source->odb->repo) && !tried_hook) {
++	if (!ret && gvfs_virtualize_objects(source->odb->repo) &&
 +	    !skip_virtualized_objects && !tried_hook) {
  		tried_hook = 1;
- 		if (!read_object_process(the_repository, oid))
+ 		if (!read_object_process(source->odb->repo, oid))
  			goto retry;
-@@ object-file.c: int has_loose_object_nonlocal(const struct object_id *oid)
- 
- int has_loose_object(const struct object_id *oid)
+@@ object-file.c: static int check_and_freshen_source(struct odb_source *source,
+ int has_loose_object(struct odb_source *source,
+ 		     const struct object_id *oid)
  {
--	return check_and_freshen(oid, 0);
-+	return check_and_freshen(oid, 0, 0);
+-	return check_and_freshen_source(source, oid, 0);
++	return check_and_freshen_source(source, oid, 0, 0);
  }
  
  int format_object_header(char *str, size_t size, enum object_type type,
-@@ object-file.c: static int write_loose_object(const struct object_id *oid, char *hdr,
- 					  FOF_SKIP_COLLISION_CHECK);
+@@ object-file.c: static int write_loose_object(struct odb_source *source,
  }
  
--static int freshen_loose_object(const struct object_id *oid)
-+static int freshen_loose_object(const struct object_id *oid,
+ static int freshen_loose_object(struct object_database *odb,
+-				const struct object_id *oid)
++				const struct object_id *oid,
 +				int skip_virtualized_objects)
  {
--	return check_and_freshen(oid, 1);
-+	return check_and_freshen(oid, 1, skip_virtualized_objects);
+ 	odb_prepare_alternates(odb);
+ 	for (struct odb_source *source = odb->sources; source; source = source->next)
+-		if (check_and_freshen_source(source, oid, 1))
++		if (check_and_freshen_source(source, oid, 1, skip_virtualized_objects))
+ 			return 1;
+ 	return 0;
  }
+@@ object-file.c: int stream_loose_object(struct odb_source *source,
+ 	close_loose_object(source, fd, tmp_file.buf);
  
- static int freshen_packed_object(const struct object_id *oid)
-@@ object-file.c: int stream_loose_object(struct input_stream *in_stream, size_t len,
- 		die(_("deflateEnd on stream object failed (%d)"), ret);
- 	close_loose_object(fd, tmp_file.buf);
- 
--	if (freshen_packed_object(oid) || freshen_loose_object(oid)) {
-+	if (freshen_packed_object(oid) || freshen_loose_object(oid, 1)) {
+ 	if (freshen_packed_object(source->odb, oid) ||
+-	    freshen_loose_object(source->odb, oid)) {
++	    freshen_loose_object(source->odb, oid, 1)) {
  		unlink_or_warn(tmp_file.buf);
  		goto cleanup;
  	}
-@@ object-file.c: int write_object_file_flags(const void *buf, size_t len,
- 	 * it out into .git/objects/??/?{38} file.
+@@ object-file.c: int write_object_file(struct odb_source *source,
  	 */
  	write_object_file_prepare(algo, buf, len, type, oid, hdr, &hdrlen);
--	if (freshen_packed_object(oid) || freshen_loose_object(oid))
-+	if (freshen_packed_object(oid) || freshen_loose_object(oid, 1))
+ 	if (freshen_packed_object(source->odb, oid) ||
+-	    freshen_loose_object(source->odb, oid))
++	    freshen_loose_object(source->odb, oid, 1))
  		return 0;
- 	if (write_loose_object(oid, hdr, hdrlen, buf, len, 0, flags))
+ 	if (write_loose_object(source, oid, hdr, hdrlen, buf, len, 0, flags))
  		return -1;
 
  ## t/t0410/read-object ##

@@ builtin/worktree.c: int cmd_worktree(int ac,
  		prefix = "";
  
 
- ## git.c ##
-@@ git.c: static struct cmd_struct commands[] = {
- #ifndef WITH_BREAKING_CHANGES
- 	{ "whatchanged", cmd_whatchanged, RUN_SETUP },
- #endif
--	{ "worktree", cmd_worktree, RUN_SETUP | BLOCK_ON_GVFS_REPO },
-+	{ "worktree", cmd_worktree, RUN_SETUP },
- 	{ "write-tree", cmd_write_tree, RUN_SETUP },
- };
- 
-
  ## gvfs.h ##
 @@ gvfs.h: struct repository;
+  */
  #define GVFS_SKIP_SHA_ON_INDEX                      (1 << 0)
- #define GVFS_BLOCK_COMMANDS                         (1 << 1)
  #define GVFS_MISSING_OK                             (1 << 2)
 +
 +/*

@@ gvfs.h: struct repository;
  #define GVFS_SKIP_SHA_ON_INDEX                      (1 << 0)
 +#define GVFS_BLOCK_COMMANDS                         (1 << 1)
  #define GVFS_MISSING_OK                             (1 << 2)
- #define GVFS_NO_DELETE_OUTSIDE_SPARSECHECKOUT       (1 << 3)
- #define GVFS_FETCH_SKIP_REACHABILITY_AND_UPLOADPACK (1 << 4)
+ 
+ /*
 
  ## t/meson.build ##
 @@ t/meson.build: integration_tests = [

@@ gvfs-helper.c (new)
 +		goto cleanup;
 +	}
 +
-+	if (finalize_object_file(pack_name_tmp.buf, pack_name_dst.buf) ||
-+	    finalize_object_file(idx_name_tmp.buf, idx_name_dst.buf)) {
++	if (finalize_object_file(the_repository, pack_name_tmp.buf, pack_name_dst.buf) ||
++	    finalize_object_file(the_repository, idx_name_tmp.buf, idx_name_dst.buf)) {
 +		unlink(pack_name_tmp.buf);
 +		unlink(pack_name_dst.buf);
 +		unlink(idx_name_tmp.buf);
@@ gvfs-helper.c (new)
 +	 * collision we have to assume something else is happening in
 +	 * parallel and we lost the race.  And that's OK.
 +	 */
-+	if (finalize_object_file(tmp_path.buf, params->loose_path.buf)) {
++	if (finalize_object_file(the_repository, tmp_path.buf, params->loose_path.buf)) {
 +		unlink(tmp_path.buf);
 +		strbuf_addf(&status->error_message,
 +			    "could not install loose object '%s'",

@@ odb.c: int odb_for_each_alternate(struct object_database *odb,
  void odb_prepare_alternates(struct object_database *odb)
  {
 +	extern struct strbuf gvfs_shared_cache_pathname;
-+
  	if (odb->loaded_alternates)
  		return;
  
  	link_alt_odb_entries(odb, odb->alternate_db, PATH_SEP, NULL, 0);
  
  	read_info_alternates(odb, odb->sources->path, 0);
--	odb->loaded_alternates = 1;
 +
 +	if (gvfs_shared_cache_pathname.len &&
 +	    !gvfs_matched_shared_cache_to_alternate) {
@@ odb.c: int odb_for_each_alternate(struct object_database *odb,
 +				     '\n', NULL, 0);
 +	}
 +
-+	odb->repo->objects->loaded_alternates = 1;
+ 	odb->loaded_alternates = 1;
  }
  
- int odb_has_alternates(struct object_database *odb)

@@ gvfs-helper.c: static void install_packfile(struct gh__response_status *status,
  		goto cleanup;
  	}
  
--	if (finalize_object_file(pack_name_tmp.buf, pack_name_dst.buf) ||
--	    finalize_object_file(idx_name_tmp.buf, idx_name_dst.buf)) {
+-	if (finalize_object_file(the_repository, pack_name_tmp.buf, pack_name_dst.buf) ||
+-	    finalize_object_file(the_repository, idx_name_tmp.buf, idx_name_dst.buf)) {
 -		unlink(pack_name_tmp.buf);
 -		unlink(pack_name_dst.buf);
 -		unlink(idx_name_tmp.buf);
 -		unlink(idx_name_dst.buf);
-+	if (finalize_object_file(params->temp_path_pack.buf,
++	if (finalize_object_file(the_repository, params->temp_path_pack.buf,
 +				 params->final_path_pack.buf) ||
-+	    finalize_object_file(params->temp_path_idx.buf,
++	    finalize_object_file(the_repository, params->temp_path_idx.buf,
 +				 params->final_path_idx.buf)) {
 +		unlink(params->temp_path_pack.buf);
 +		unlink(params->temp_path_idx.buf);

@@ gvfs-helper.c: static void install_packfile(struct gh__request_params *params,
 +	oi.typep = &type;
 +	oi.sizep = &size;
 +
-+	ret = read_loose_object(path, expected_oid, &real_oid, &contents, &oi);
++	ret = read_loose_object(the_repository, path, expected_oid, &real_oid, &contents, &oi);
 +	free(contents);
 +
 +	return ret;

@@ gvfs-helper.c: static int create_loose_pathname_in_odb(struct strbuf *buf_path,
 +				 struct strbuf *final_path_idx,
 +				 struct strbuf *final_filename)
 +{
-+	if (finalize_object_file(temp_path_pack->buf, final_path_pack->buf) ||
-+	    finalize_object_file(temp_path_idx->buf, final_path_idx->buf)) {
++	if (finalize_object_file(the_repository, temp_path_pack->buf, final_path_pack->buf) ||
++	    finalize_object_file(the_repository, temp_path_idx->buf, final_path_idx->buf)) {
 +		unlink(temp_path_pack->buf);
 +		unlink(temp_path_idx->buf);
 +		unlink(final_path_pack->buf);
@@ gvfs-helper.c: static void create_tempfile_for_loose(
  		goto cleanup;
  	}
  
--	if (finalize_object_file(params->temp_path_pack.buf,
+-	if (finalize_object_file(the_repository, params->temp_path_pack.buf,
 -				 params->final_path_pack.buf) ||
--	    finalize_object_file(params->temp_path_idx.buf,
+-	    finalize_object_file(the_repository, params->temp_path_idx.buf,
 -				 params->final_path_idx.buf)) {
 -		unlink(params->temp_path_pack.buf);
 -		unlink(params->temp_path_idx.buf);
@@ gvfs-helper.c: static void install_loose(struct gh__request_params *params,
  	 * collision we have to assume something else is happening in
  	 * parallel and we lost the race.  And that's OK.
  	 */
--	if (finalize_object_file(tmp_path.buf, params->loose_path.buf)) {
+-	if (finalize_object_file(the_repository, tmp_path.buf, params->loose_path.buf)) {
 +	if (create_loose_pathname_in_odb(&loose_path, &params->loose_oid)) {
 +		strbuf_addf(&status->error_message,
 +			    "cannot create directory for loose object '%s'",
@@ gvfs-helper.c: static void install_loose(struct gh__request_params *params,
 +		goto cleanup;
 +	}
 +
-+	if (finalize_object_file(tmp_path.buf, loose_path.buf)) {
++	if (finalize_object_file(the_repository, tmp_path.buf, loose_path.buf)) {
  		unlink(tmp_path.buf);
  		strbuf_addf(&status->error_message,
  			    "could not install loose object '%s'",

@@ gvfs-helper.c: static void my_finalize_packfile(struct gh__request_params *param
 +	 * has already munged errno (and it has various creation
 +	 * strategies), so we don't bother looking at it.
 +	 */
- 	if (finalize_object_file(temp_path_pack->buf, final_path_pack->buf) ||
- 	    finalize_object_file(temp_path_idx->buf, final_path_idx->buf)) {
+ 	if (finalize_object_file(the_repository, temp_path_pack->buf, final_path_pack->buf) ||
+ 	    finalize_object_file(the_repository, temp_path_idx->buf, final_path_idx->buf)) {
  		unlink(temp_path_pack->buf);
  		unlink(temp_path_idx->buf);
 -		unlink(final_path_pack->buf);

@@ builtin/gc.c: static int write_loose_object_to_stdin(const struct object_id *oid
  	int result = 0;
  	struct write_loose_object_data data;
  	struct child_process pack_proc = CHILD_PROCESS_INIT;
++	struct odb_source *prev_source = NULL;
 +	const char *object_dir = r->objects->sources->path;
 +
 +	/* If set, use the shared object directory. */
-+	if (shared_object_dir)
++	if (shared_object_dir) {
++		prev_source =
++			odb_set_temporary_primary_source(r->objects,
++							 shared_object_dir, 0);
 +		object_dir = shared_object_dir;
++	}
  
  	/*
  	 * Do not start pack-objects process
- 	 * if there are no loose objects.
+@@ builtin/gc.c: static int pack_loose(struct maintenance_run_opts *opts)
  	 */
--	if (!for_each_loose_file_in_objdir(r->objects->sources->path,
-+	if (!for_each_loose_file_in_objdir(object_dir,
+ 	if (!for_each_loose_file_in_source(r->objects->sources,
  					   bail_on_loose,
- 					   NULL, NULL, NULL))
+-					   NULL, NULL, NULL))
++					   NULL, NULL, NULL)) {
++		if (shared_object_dir)
++			odb_restore_primary_source(r->objects, prev_source,
++						   shared_object_dir);
  		return 0;
++	}
+ 
+ 	pack_proc.git_cmd = 1;
+ 
 @@ builtin/gc.c: static int pack_loose(struct maintenance_run_opts *opts)
  		strvec_push(&pack_proc.args, "--quiet");
  	else
@@ builtin/gc.c: static int pack_loose(struct maintenance_run_opts *opts)
  	pack_proc.in = -1;
  
 @@ builtin/gc.c: static int pack_loose(struct maintenance_run_opts *opts)
- 	else if (data.batch_size > 0)
- 		data.batch_size--; /* Decrease for equality on limit. */
  
--	for_each_loose_file_in_objdir(r->objects->sources->path,
-+	for_each_loose_file_in_objdir(object_dir,
- 				      write_loose_object_to_stdin,
- 				      NULL,
- 				      NULL,
+ 	if (start_command(&pack_proc)) {
+ 		error(_("failed to start 'git pack-objects' process"));
++		if (shared_object_dir)
++			odb_restore_primary_source(r->objects, prev_source,
++						   shared_object_dir);
+ 		return 1;
+ 	}
+ 
+@@ builtin/gc.c: static int pack_loose(struct maintenance_run_opts *opts)
+ 		result = 1;
+ 	}
+ 
++	if (shared_object_dir)
++		odb_restore_primary_source(r->objects, prev_source,
++					   shared_object_dir);
++
+ 	return result;
+ }
+ 
 @@ builtin/gc.c: static int task_option_parse(const struct option *opt,
  }
  

@@ .github/workflows/build-git-installers.yml (new)
 +      - name: Validate tag
 +        run: |
 +          echo "$GITHUB_REF" |
-+          grep -E '^refs/tags/v2\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.vfs\.0\.(0|[1-9][0-9]*)(\.rc[0-9])?$' || {
-+            echo "::error::${GITHUB_REF#refs/tags/} is not of the form v2.<X>.<Y>.vfs.0.<W>[.rc<N>]" >&2
++            grep -E '^refs/tags/v2\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)(-rc[0-9]+)?\.vfs\.0\.(0|[1-9][0-9]*)$' || {
++            echo "::error::${GITHUB_REF#refs/tags/} is not of the form v2.<X>.<Y>[-rc<N>].vfs.0.<W>" >&2
 +            exit 1
 +          }
 +      - name: Determine tag to build
@@ .github/workflows/build-git-installers.yml (new)
 +          # Verify tag follows rules in GIT-VERSION-GEN (i.e., matches the specified "DEF_VER" in
 +          # GIT-VERSION-FILE) and matches tag determined from trigger
 +          make GIT-VERSION-FILE
-+          test "${{ steps.tag.outputs.version }}" == "$(sed -n 's/^GIT_VERSION *= *//p'< GIT-VERSION-FILE)" || die "GIT-VERSION-FILE tag ($(cat GIT-VERSION-FILE)) does not match ${{ steps.tag.outputs.name }}"
++          expected_version="${{ steps.tag.outputs.version }}"
++          # Convert -rc to .rc to match GIT-VERSION-FILE format
++          expected_version="${expected_version//-rc/.rc}"
++          test "$expected_version" == "$(sed -n 's/^GIT_VERSION *= *//p'< GIT-VERSION-FILE)" || die "GIT-VERSION-FILE tag ($(cat GIT-VERSION-FILE)) does not match ${{ steps.tag.outputs.name }}"
 +  # End check prerequisites for the workflow
 +
 +  # Build Windows installers (x86_64 & aarch64; installer & portable)

@@ .github/macos-installer/Makefile (new)
 +PREFIX := /usr/local
 +GIT_PREFIX := $(PREFIX)/git
 +
++# Replace -rc with .rc in the version string
++# This is to ensure compatibility with the format as generated by GIT-VERSION-GEN
++ORIGINAL_VERSION := $(VERSION)
++VERSION := $(shell echo $(ORIGINAL_VERSION) | sed 's/-rc/.rc/g')
++
 +BUILD_DIR := $(GITHUB_WORKSPACE)/payload
 +DESTDIR := $(PWD)/stage/git-$(ARCH_UNIV)-$(VERSION)
 +ARTIFACTDIR := build-artifacts
@@ .github/macos-installer/Makefile (new)
 +	pkg_cmd += --sign "$(APPLE_INSTALLER_IDENTITY)"
 +endif
 +
-+pkg_cmd += disk-image/git-$(VERSION)-$(ARCH_UNIV).pkg
-+disk-image/git-$(VERSION)-$(ARCH_UNIV).pkg: disk-image/VERSION-$(VERSION)-$(ARCH_UNIV) symlinks
++pkg_cmd += disk-image/git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).pkg
++
++disk-image/git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).pkg: disk-image/VERSION-$(VERSION)-$(ARCH_UNIV) symlinks
 +	$(pkg_cmd)
 +
 +git-%-$(ARCH_UNIV).dmg:
-+	hdiutil create git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg -fs HFS+ -srcfolder disk-image -volname "Git $(VERSION) $(ARCH_UNIV)" -ov 2>&1 | tee err || { \
++	hdiutil create git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).uncompressed.dmg -fs HFS+ -srcfolder disk-image -volname "Git $(ORIGINAL_VERSION) $(ARCH_UNIV)" -ov 2>&1 | tee err || { \
 +		grep "Resource busy" err && \
 +		sleep 5 && \
-+		hdiutil create git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg -fs HFS+ -srcfolder disk-image -volname "Git $(VERSION) $(ARCH_UNIV)" -ov; }
-+	hdiutil convert -format UDZO -o $@ git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg
-+	rm -f git-$(VERSION)-$(ARCH_UNIV).uncompressed.dmg
++		hdiutil create git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).uncompressed.dmg -fs HFS+ -srcfolder disk-image -volname "Git $(ORIGINAL_VERSION) $(ARCH_UNIV)" -ov; }
++	hdiutil convert -format UDZO -o $@ git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).uncompressed.dmg
++	rm -f git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).uncompressed.dmg
 +
 +payload: $(BUILD_DIR)/git-$(VERSION)/osx-installed $(BUILD_DIR)/git-$(VERSION)/osx-built-assert-$(ARCH_UNIV)
 +
-+pkg: disk-image/git-$(VERSION)-$(ARCH_UNIV).pkg
++pkg: disk-image/git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).pkg
 +
-+image: git-$(VERSION)-$(ARCH_UNIV).dmg
++image: git-$(ORIGINAL_VERSION)-$(ARCH_UNIV).dmg
 +
 +ifdef APPLE_APP_IDENTITY
 +codesign:
@@ .github/workflows/build-git-installers.yml: jobs:
 +          # Trace execution, stop on error
 +          set -ex
 +
-+          # Write to "version" file to force match with trigger payload version
-+          echo "${{ needs.prereqs.outputs.tag_version }}" >>git/version
++          # Convert -rc to .rc to match GIT-VERSION-FILE behavior
++          BUILD_VERSION=$(echo "${VERSION}" | sed 's/-rc/.rc/g')
 +
 +          # Configure universal build
 +          cat >git/config.mak <<EOF
@@ .github/workflows/build-git-installers.yml: jobs:
 +
 +          # Extract tarballs
 +          mkdir payload manpages
-+          tar -xvf git/git-$VERSION.tar.gz -C payload
-+          tar -xvf git/git-manpages-$VERSION.tar.gz -C manpages
++          tar -xvf git/git-$BUILD_VERSION.tar.gz -C payload
++          tar -xvf git/git-manpages-$BUILD_VERSION.tar.gz -C manpages
 +
 +          # Lay out payload
-+          cp git/config.mak payload/git-$VERSION/config.mak
++          cp git/config.mak payload/git-$BUILD_VERSION/config.mak
 +          make -C git/.github/macos-installer V=1 payload
 +
 +          # Codesign payload
-+          cp -R stage/git-universal-$VERSION/ \
++          cp -R stage/git-universal-$BUILD_VERSION/ \
 +            git/.github/macos-installer/build-artifacts
 +          make -C git/.github/macos-installer V=1 codesign \
 +            APPLE_APP_IDENTITY='${{ steps.signing-secrets.outputs.appsign-id }}' || die "Creating signed payload failed"

@@ .github/workflows/build-git-installers.yml: jobs:
 +              exit 1
 +          }
 +
-+          echo "${{ needs.prereqs.outputs.tag_version }}" >>git/version
-+          make -C git GIT-VERSION-FILE
-+
 +          VERSION="${{ needs.prereqs.outputs.tag_version }}"
++          make -C git GIT-VERSION-FILE
 +
 +          ARCH="$(dpkg-architecture -q DEB_HOST_ARCH)"
 +          if test -z "$ARCH"; then

@@ Commit message
     Signed-off-by: Victoria Dye <[email protected]>
 
  ## .github/macos-installer/Makefile ##
-@@ .github/macos-installer/Makefile: GIT_PREFIX := $(PREFIX)/git
+@@ .github/macos-installer/Makefile: VERSION := $(shell echo $(ORIGINAL_VERSION) | sed 's/-rc/.rc/g')
  BUILD_DIR := $(GITHUB_WORKSPACE)/payload
  DESTDIR := $(PWD)/stage/git-$(ARCH_UNIV)-$(VERSION)
  ARTIFACTDIR := build-artifacts
@@ .github/workflows/build-git-installers.yml: jobs:
  
            make -C git -j$(sysctl -n hw.physicalcpu) GIT-VERSION-FILE dist dist-doc
  
-+          export GIT_BUILT_FROM_COMMIT=$(gunzip -c git/git-$VERSION.tar.gz | git get-tar-commit-id) ||
++          export GIT_BUILT_FROM_COMMIT=$(gunzip -c git/git-$BUILD_VERSION.tar.gz | git get-tar-commit-id) ||
 +            die "Could not determine commit for build"
 +
            # Extract tarballs
            mkdir payload manpages
-           tar -xvf git/git-$VERSION.tar.gz -C payload
+           tar -xvf git/git-$BUILD_VERSION.tar.gz -C payload

@@ .github/workflows/build-git-installers.yml: jobs:
 +        shell: bash
 +        run: |
 +          "${{ matrix.component.command }}" --version | sed 's/git version //' >actual
-+          echo ${{ needs.prereqs.outputs.tag_version }} >expect
++          echo "${{ needs.prereqs.outputs.tag_version }}" | sed 's/-rc/.rc/g' >expect
 +          cmp expect actual || exit 1
 +
 +      - name: Validate universal binary CPU architecture

@@ builtin/gc.c: static int maintenance_task_incremental_repack(struct maintenance_
 +	for_each_file_in_pack_dir(r->objects->sources->path, move_pack_to_shared_cache,
 +				  dstdir.buf);
 +
-+	for_each_loose_object(move_loose_object_to_shared_cache, NULL,
++	for_each_loose_object(r->objects, move_loose_object_to_shared_cache, NULL,
 +			      FOR_EACH_OBJECT_LOCAL_ONLY);
 +
 +cleanup:

@@ git.c: static struct cmd_struct commands[] = {
  #ifndef WITH_BREAKING_CHANGES
  	{ "whatchanged", cmd_whatchanged, RUN_SETUP },
  #endif
--	{ "worktree", cmd_worktree, RUN_SETUP },
+-	{ "worktree", cmd_worktree, RUN_SETUP | BLOCK_ON_GVFS_REPO },
 +	{ "worktree", cmd_worktree, RUN_SETUP | BLOCK_ON_VFS_ENABLED },
  	{ "write-tree", cmd_write_tree, RUN_SETUP },
  };

@@ Commit message
 
     Signed-off-by: Johannes Schindelin <[email protected]>
 
- ## object-store.c ##
-@@ object-store.c: int read_object_process(const struct object_id *oid)
- 	const char *cmd = find_hook(the_repository, "read-object");
+ ## odb.c ##
+@@ odb.c: int read_object_process(struct repository *r, const struct object_id *oid)
+ 	const char *cmd = find_hook(r, "read-object");
  	uint64_t start;
  
 +	if (!cmd)
@@ object-store.c: int read_object_process(const struct object_id *oid)
 +
  	start = getnanotime();
  
- 	trace2_region_enter("subprocess", "read_object", the_repository);
+ 	trace2_region_enter("subprocess", "read_object",r);

@@ commit.c: int repo_parse_commit_internal(struct repository *r,
 +	 * And the idea with VFS for Git is to re-download corrupted objects,
 +	 * not to fail!
 +	 */
- 	if (gvfs_config_is_set(GVFS_MISSING_OK))
+ 	if (gvfs_config_is_set(r, GVFS_MISSING_OK))
 -		flags ^= OBJECT_INFO_SKIP_FETCH_OBJECT;
 +		flags &= ~(OBJECT_INFO_SKIP_FETCH_OBJECT |
 +			   OBJECT_INFO_DIE_IF_CORRUPT);
@@ commit.c: int repo_parse_commit_internal(struct repository *r,
  	if (!item)
  		return -1;
 
- ## object-store.c ##
-@@
- #include "dir.h"
- #include "environment.h"
- #include "gettext.h"
-+#include "gvfs.h"
- #include "gvfs-helper-client.h"
- #include "hex.h"
- #include "hook.h"
-@@ object-store.c: void *repo_read_object_file(struct repository *r,
+ ## odb.c ##
+@@ odb.c: void *odb_read_object(struct object_database *odb,
  	unsigned flags = OBJECT_INFO_DIE_IF_CORRUPT | OBJECT_INFO_LOOKUP_REPLACE;
  	void *data;
  
-+	if (gvfs_config_is_set(GVFS_MISSING_OK))
++	if (gvfs_config_is_set(odb->repo, GVFS_MISSING_OK))
 +		flags &= ~OBJECT_INFO_DIE_IF_CORRUPT;
 +
  	oi.typep = type;