para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix git diff invocation by using origin/ branch

Browse Source
This commit is contained in:
Daniel Donenfeld 2019-02-26 17:00:34 -08:00
parent 30092d9f6f
commit adffa26f25
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/scripts/deploy-asm.ps1
View File

@ -19,7 +19,7 @@ function collectAsm {
} }
#Only merge in asm if there is any change between the current branch and the final asm branch #Only merge in asm if there is any change between the current branch and the final asm branch
cmd.exe /c "git diff --quiet $($branchName)..$($asmFinalBranch)" cmd.exe /c "git diff --quiet origin/$($branchName)..$($asmFinalBranch)"
if(-not $?){ if(-not $?){
# Use cherry-pick as the asm branches only have a single commit # Use cherry-pick as the asm branches only have a single commit
cmd.exe /c "git cherry-pick origin/$($branchName) --allow-empty 2>&1" cmd.exe /c "git cherry-pick origin/$($branchName) --allow-empty 2>&1"