Merge pull request microsoft#472 from vdye/ms/macos-build-options

Fixes for MacOS release build & build options

.github/workflows/build-git-installers.yml

@@ -354,6 +354,9 @@ jobs:
           cp git/git-$VERSION.tar.gz git/git-manpages-$VERSION.tar.gz git_osx_installer/build/ ||
             die "Could not copy .tar.gz files"
 
+          GIT_BUILT_FROM_COMMIT=$(gunzip -c git/git-$VERSION.tar.gz | git get-tar-commit-id) ||
+            die "Could not determine commit for build"
+
           # drop the -isysroot `GIT_SDK` hack
           sed -i .bak -e 's/ -isysroot .(SDK_PATH)//' git_osx_installer/Makefile || die "Could not drop the -isysroot hack"
 
@@ -371,6 +374,7 @@ jobs:
 
           PATH=/usr/local/bin:$PATH \
           make -C git_osx_installer \
+              GIT_BUILT_FROM_COMMIT=$GIT_BUILT_FROM_COMMIT \
               OSX_VERSION=10.15 C_INCLUDE_PATH="$C_INCLUDE_PATH" V=1 image ||
             die "Build failed"
 

.gitignore

@@ -3,6 +3,7 @@
 /fuzz-pack-headers
 /fuzz-pack-idx
 /GIT-BUILD-OPTIONS
+/GIT-BUILT-FROM-COMMIT
 /GIT-CFLAGS
 /GIT-LDFLAGS
 /GIT-PREFIX

Makefile

@@ -389,6 +389,10 @@ all::
 # Define GIT_USER_AGENT if you want to change how git identifies itself during
 # network interactions.  The default is "git/$(GIT_VERSION)".
 #
+# Define GIT_BUILT_FROM_COMMIT if you want to force the commit hash identified
+# in 'git version --build-options' to a specific value. The default is the
+# commit hash of the current HEAD.
+#
 # Define DEFAULT_HELP_FORMAT to "man", "info" or "html"
 # (defaults to "man") if you want to have a different default when
 # "git help" is called without a parameter specifying the format.
@@ -2155,6 +2159,15 @@ GIT-USER-AGENT: FORCE
 		echo '$(GIT_USER_AGENT_SQ)' >GIT-USER-AGENT; \
 	fi
 
+GIT_BUILT_FROM_COMMIT = $(eval GIT_BUILT_FROM_COMMIT := $$(shell \
+	GIT_CEILING_DIRECTORIES="$$(CURDIR)/.." \
+	git rev-parse -q --verify HEAD 2>/dev/null))$(GIT_BUILT_FROM_COMMIT)
+GIT-BUILT-FROM-COMMIT: FORCE
+	@if test x'$(GIT_BUILT_FROM_COMMIT)' != x"`cat GIT-BUILT-FROM-COMMIT 2>/dev/null`" ; then \
+		echo >&2 "    * new built-from commit"; \
+		echo '$(GIT_BUILT_FROM_COMMIT)' >GIT-BUILT-FROM-COMMIT; \
+	fi
+
 ifdef DEFAULT_HELP_FORMAT
 BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"'
 endif
@@ -2279,13 +2292,11 @@ PAGER_ENV_CQ_SQ = $(subst ','\'',$(PAGER_ENV_CQ))
 pager.sp pager.s pager.o: EXTRA_CPPFLAGS = \
 	-DPAGER_ENV='$(PAGER_ENV_CQ_SQ)'
 
-version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT
+version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT GIT-BUILT-FROM-COMMIT
 version.sp version.s version.o: EXTRA_CPPFLAGS = \
 	'-DGIT_VERSION="$(GIT_VERSION)"' \
 	'-DGIT_USER_AGENT=$(GIT_USER_AGENT_CQ_SQ)' \
-	'-DGIT_BUILT_FROM_COMMIT="$(shell \
-		GIT_CEILING_DIRECTORIES="$(CURDIR)/.." \
-		git rev-parse -q --verify HEAD 2>/dev/null)"'
+	'-DGIT_BUILT_FROM_COMMIT="$(GIT_BUILT_FROM_COMMIT)"'
 
 $(BUILT_INS): git$X
 	$(QUIET_BUILT_IN)$(RM) $@ && \
@@ -3307,7 +3318,7 @@ dist: git-archive$(X) configure
 	@$(MAKE) -C git-gui TARDIR=../.dist-tmp-dir/git-gui dist-version
 	./git-archive --format=tar \
 		$(GIT_ARCHIVE_EXTRA_FILES) \
-		--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
+		--prefix=$(GIT_TARNAME)/ HEAD > $(GIT_TARNAME).tar
 	@$(RM) -r .dist-tmp-dir
 	gzip -f -9 $(GIT_TARNAME).tar
 

README.md

@@ -1,8 +1,8 @@
 `microsoft/git` and the Scalar CLI
 ==================================
 
-[![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/microsoft/git)
-[![Build status](https://github.com/microsoft/git/workflows/CI/badge.svg)](https://github.com/microsoft/git/actions/workflows/main.yml)
+[![CI/PR](https://github.com/microsoft/git/actions/workflows/main.yml/badge.svg)](https://github.com/microsoft/git/actions/workflows/main.yml)
+[![CI](https://github.com/microsoft/git/actions/workflows/main.yml/badge.svg)](https://github.com/microsoft/git/actions/workflows/main.yml)
 
 This is `microsoft/git`, a special Git distribution to support monorepo scenarios. If you are _not_
 working in a monorepo, you are likely searching for

contrib/scalar/t/t9099-scalar.sh

@@ -50,30 +50,6 @@ test_expect_success 'scalar unregister' '
 	! grep -F "$(pwd)/vanish/src" scalar.repos
 '
 
-<<<<<<< HEAD
-test_expect_success 'set up repository to clone' '
-	test_commit first &&
-	test_commit second &&
-	test_commit third &&
-	git switch -c parallel first &&
-	mkdir -p 1/2 &&
-	test_commit 1/2/3 &&
-	git config uploadPack.allowFilter true &&
-	git config uploadPack.allowAnySHA1InWant true
-||||||| parent of 0a71491f41 (scalar: test `scalar clone`)
-test_expect_success '`scalar register` & `unregister` with existing repo' '
-	git init existing &&
-	scalar register existing &&
-	git config --get --global --fixed-value \
-		maintenance.repo "$(pwd)/existing" &&
-	scalar list >scalar.repos &&
-	grep -F "$(pwd)/existing" scalar.repos &&
-	scalar unregister existing &&
-	test_must_fail git config --get --global --fixed-value \
-		maintenance.repo "$(pwd)/existing" &&
-	scalar list >scalar.repos &&
-	! grep -F "$(pwd)/existing" scalar.repos
-=======
 test_expect_success 'set up repository to clone' '
 	test_commit first &&
 	test_commit second &&
@@ -115,29 +91,6 @@ test_expect_success '`scalar register` & `unregister` with existing repo' '
 		maintenance.repo "$(pwd)/existing" &&
 	scalar list >scalar.repos &&
 	! grep -F "$(pwd)/existing" scalar.repos
->>>>>>> 0a71491f41 (scalar: test `scalar clone`)
-'
-
-test_expect_success 'scalar clone' '
-	second=$(git rev-parse --verify second:second.t) &&
-	scalar clone "file://$(pwd)" cloned --single-branch &&
-	(
-		cd cloned/src &&
-
-		git config --get --global --fixed-value maintenance.repo \
-			"$(pwd)" &&
-
-		git for-each-ref --format="%(refname)" refs/remotes/origin/ >actual &&
-		echo "refs/remotes/origin/parallel" >expect &&
-		test_cmp expect actual &&
-
-		test_path_is_missing 1/2 &&
-		test_must_fail git rev-list --missing=print $second &&
-		git rev-list $second &&
-		git cat-file blob $second >actual &&
-		echo "second" >expect &&
-		test_cmp expect actual
-	)
 '
 
 SQ="'"

run-command.c

@@ -1330,6 +1330,8 @@ int run_hook_strvec(const char *const *env, const char *name,
 
 	strvec_push(&hook.args, p);
 	strvec_pushv(&hook.args, argv->v);
+	if (env)
+			strvec_pushv(&hook.env_array, (const char **)env);
 	hook.no_stdin = 1;
 	hook.trace2_hook_name = name;
 

t/helper/test-gvfs-protocol.c

@@ -1747,7 +1747,7 @@ static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
 				 mayhem_child++);
 	}
 
-	cld.argv = cld_argv.v;
+	strvec_pushv(&cld.args, cld_argv.v);
 	cld.in = incoming;
 	cld.out = dup(incoming);