Update 1 package

git-extra (1.1.620.3c8aba0b6-1 -> 1.1.624.83eb82466-1) Signed-off-by: Git for Windows Build Agent <ci@git-for-windows.build>
git-for-windows · Jan 21, 2023 · 99b1361 · 99b1361
1 parent b888f73
commit 99b1361
Show file tree

Hide file tree

Showing 29 changed files with 12 additions and 36 deletions.
diff --git a/etc/profile.d/env.sh b/etc/profile.d/env.sh
@@ -20,14 +20,12 @@ test -n "$SSH_ASKPASS" || {
 			export SSH_ASKPASS=/mingw32/libexec/git-core/git-gui--askpass
 		fi
 		;;
-	ARM64)
+	CLANGARM64)
 		export DISPLAY=needs-to-be-defined
-		if [ -f /arm64/bin/git-askpass.exe ]; then
-			export SSH_ASKPASS=/arm64/bin/git-askpass.exe
-		elif [ -f /mingw32/bin/git-askpass.exe ]; then
-			export SSH_ASKPASS=/mingw32/bin/git-askpass.exe
+		if [ -f /clangarm64/bin/git-askpass.exe ]; then
+			export SSH_ASKPASS=/clangarm64/bin/git-askpass.exe
 		else
-			export SSH_ASKPASS=/mingw32/libexec/git-core/git-gui--askpass
+			export SSH_ASKPASS=/clangarm64/libexec/git-core/git-gui--askpass
 		fi
 		;;
 	esac

diff --git a/mingw64/bin/WhoUses.exe b/mingw64/bin/WhoUses.exe
diff --git a/mingw64/bin/blocked-file-util.exe b/mingw64/bin/blocked-file-util.exe
diff --git a/mingw64/bin/create-shortcut.exe b/mingw64/bin/create-shortcut.exe
diff --git a/mingw64/bin/git-askpass.exe b/mingw64/bin/git-askpass.exe
diff --git a/mingw64/bin/git-askyesno.exe b/mingw64/bin/git-askyesno.exe
diff --git a/mingw64/bin/git-credential-helper-selector.exe b/mingw64/bin/git-credential-helper-selector.exe
diff --git a/mingw64/bin/proxy-lookup.exe b/mingw64/bin/proxy-lookup.exe
diff --git a/var/lib/pacman/local/git-extra-1.1.620.3c8aba0b6-1/mtree b/var/lib/pacman/local/git-extra-1.1.620.3c8aba0b6-1/mtree
diff --git a/.../local/git-extra-1.1.620.3c8aba0b6-1/desc → .../local/git-extra-1.1.624.83eb82466-1/desc b/.../local/git-extra-1.1.620.3c8aba0b6-1/desc → .../local/git-extra-1.1.624.83eb82466-1/desc
@@ -2,7 +2,7 @@
 git-extra
 
 %VERSION%
-1.1.620.3c8aba0b6-1
+1.1.624.83eb82466-1
 
 %BASE%
 mingw-w64-git-extra
@@ -17,16 +17,16 @@ https://github.com/git-for-windows/build-extra
 x86_64
 
 %BUILDDATE%
-1674162971
+1674218623
 
 %INSTALLDATE%
-1674184364
+1674270236
 
 %PACKAGER%
 Johannes Schindelin <johannes.schindelin@gmx.de>
 
 %SIZE%
-500965
+500883
 
 %GROUPS%
 VCS

diff --git a/...local/git-extra-1.1.620.3c8aba0b6-1/files → ...local/git-extra-1.1.624.83eb82466-1/files b/...local/git-extra-1.1.620.3c8aba0b6-1/files → ...local/git-extra-1.1.624.83eb82466-1/files
diff --git a/...cal/git-extra-1.1.620.3c8aba0b6-1/install → ...cal/git-extra-1.1.624.83eb82466-1/install b/...cal/git-extra-1.1.620.3c8aba0b6-1/install → ...cal/git-extra-1.1.624.83eb82466-1/install
@@ -120,6 +120,10 @@ GITATTRIBUTES
 	grep -q "$otherpacman" etc/pacman.conf ||
 	sed -i -e '/^\[mingw32\]/i['$otherpacman']\nServer = https://wingit.blob.core.windows.net/'$otherarch'\n' etc/pacman.conf
 
+	test ! -d /clangarm64 ||
+	grep -q "git-for-windows-aarch64" etc/pacman.conf ||
+	sed -i -e '/^\[clangarm64]/i[git-for-windows-aarch64]\nServer = https://wingit.blob.core.windows.net/aarch64\n' etc/pacman.conf
+
 	! grep -q 'https://dl.bintray.com/\$repo/pacman/\$arch' etc/pacman.conf ||
 	sed -i -e 's/https:\/\/dl\.bintray\.com\/\$repo\/pacman\/\$arch/https:\/\/wingit.blob.core.windows.net\/'$arch'/g' etc/pacman.conf
 
@@ -290,32 +294,6 @@ test -d "$TMPDIR" || test ! -d "$TMP" || {\
 	# As we no longer need it, delete it.
 	test ! -h /ssl || rm /ssl
 
-	# Allow an i686 version of Git for Windows, augmented by `/arm64/*`, to serve
-	# as sort of an ARM64 version of Git for Windows (because Windows/ARM64 can run
-	# i686 executables via a built-in emulator).
-	test i686 != "$arch" ||
-	grep -q '^ARM64)$' /etc/profile ||
-	sed -i '/^MINGW64)/{
-		# read entire `case` arm until `;;`
-		:1;N;/[^;]$/b1;
-
-		# print out the MINGW64 `case` arm unchanged
-		p;
-
-		# now, transmogrify it into the ARM64 `case` arm:
-		s|^MINGW|ARM|;
-		# change the MINGW_PREFIX
-		s|\${MINGW_PREFIX}|/arm64|;
-		# add the /mingw32/bin fall-back to the PATH
-		s| PATH=[^:]*|&:/mingw32/bin|;
-		# adjust the pkgconfig path
-		s|/share/pkgconfig|&:/mingw32/lib/pkgconfig:/mingw32/share/pkgconfig|;
-		# adjust autoconf path
-		s|:/usr/share/aclocal|:/mingw32/share/aclocal&|;
-		# add the /mingw32 fall-back paths to MANPATH
-		s|:\${MANPATH}|:/mingw32/local/man:/mingw32/share/man&|
-	}' /etc/profile
-
 	# Work around /etc/xml/catalog being updated using the MINGW version of xmlcatalog
 	! grep -q '"[CD]:/' /etc/xml/catalog ||
 	sed -i -e 's|"[CD]:/[^"]*/usr/|"/usr/|g' /etc/xml/catalog

diff --git a/var/lib/pacman/local/git-extra-1.1.624.83eb82466-1/mtree b/var/lib/pacman/local/git-extra-1.1.624.83eb82466-1/mtree
diff --git a/var/lib/pacman/sync/clang32.db b/var/lib/pacman/sync/clang32.db
diff --git a/var/lib/pacman/sync/clang32.db.sig b/var/lib/pacman/sync/clang32.db.sig
diff --git a/var/lib/pacman/sync/clang64.db b/var/lib/pacman/sync/clang64.db
diff --git a/var/lib/pacman/sync/clang64.db.sig b/var/lib/pacman/sync/clang64.db.sig
diff --git a/var/lib/pacman/sync/clangarm64.db b/var/lib/pacman/sync/clangarm64.db
diff --git a/var/lib/pacman/sync/clangarm64.db.sig b/var/lib/pacman/sync/clangarm64.db.sig
diff --git a/var/lib/pacman/sync/git-for-windows-mingw32.db b/var/lib/pacman/sync/git-for-windows-mingw32.db
diff --git a/var/lib/pacman/sync/git-for-windows-mingw32.db.sig b/var/lib/pacman/sync/git-for-windows-mingw32.db.sig
diff --git a/var/lib/pacman/sync/git-for-windows.db b/var/lib/pacman/sync/git-for-windows.db
diff --git a/var/lib/pacman/sync/git-for-windows.db.sig b/var/lib/pacman/sync/git-for-windows.db.sig
diff --git a/var/lib/pacman/sync/mingw32.db b/var/lib/pacman/sync/mingw32.db
diff --git a/var/lib/pacman/sync/mingw32.db.sig b/var/lib/pacman/sync/mingw32.db.sig
diff --git a/var/lib/pacman/sync/mingw64.db b/var/lib/pacman/sync/mingw64.db
diff --git a/var/lib/pacman/sync/mingw64.db.sig b/var/lib/pacman/sync/mingw64.db.sig
diff --git a/var/lib/pacman/sync/ucrt64.db b/var/lib/pacman/sync/ucrt64.db
diff --git a/var/lib/pacman/sync/ucrt64.db.sig b/var/lib/pacman/sync/ucrt64.db.sig