From 898bfe73560e45c7ba55b2eba3451412d3d9a5e4 Mon Sep 17 00:00:00 2001
From: Chris Rummel <crummel@microsoft.com>
Date: Wed, 15 Jun 2022 17:52:57 -0500
Subject: [PATCH] Fixups to make the tarball committable (#13894)

---
 .../Arcade/tools/SourceBuildArcadeTarball.targets     | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
index ff9296640..c4f3f6ec2 100644
--- a/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
+++ b/src/SourceBuild/Arcade/tools/SourceBuildArcadeTarball.targets
@@ -124,6 +124,7 @@
       <TarballRepoSourceEngDir>$(TarballSourceDir)$(SourceDir)eng/</TarballRepoSourceEngDir>
       <TarballVersionDetailsFile>$(TarballRepoSourceEngDir)Version.Details.xml</TarballVersionDetailsFile>
       <CloneParam Condition=" '$(CloneVerbosity)' == 'quiet' ">-q</CloneParam>
+      <OriginalRepoUri>$(RepoUri)</OriginalRepoUri>
       <RepoUri Condition=" '$(AzDoPat)' != '' ">$(RepoUri.Replace('https://dev.azure.com', 'https://dn-bot:$(AzDoPat)@dev.azure.com'))</RepoUri>
     </PropertyGroup>
 
@@ -175,10 +176,18 @@
       Command="git submodule update --init --recursive --depth 1"
       WorkingDirectory="$(TarballRepoSourceDir)" />
 
+    <Exec
+      Command="git config --file $(TarballRepoSourceDir)/.git/config --unset remote.origin.url"
+      WorkingDirectory="$(RepoRoot)"/>
+
+    <Exec
+      Command="git config --file $(TarballRepoSourceDir)/.git/config --add remote.origin.url $(OriginalRepoUri)"
+      WorkingDirectory="$(RepoRoot)"/>
+
     <!-- Remove the git objects folder to free up tarball space -->
     <Exec
       Command="rm -rf objects"
-      WorkingDirectory="$(TarballRepoSourceDir).git" 
+      WorkingDirectory="$(TarballRepoSourceDir).git"
       Condition="$(PreserveTarballGitFolders) != 'true'" />
 
     <Message Text="--> Done Cloning Repo $(SourceBuildRepoName)" Importance="High" />