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

Allow empty with git-cherry-pick

Browse Source
This commit is contained in:
Daniel Donenfeld 2019-02-16 21:46:29 -08:00
parent 54cf763ab1
commit bcd7b60df7
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 {
} }
# 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) 2>&1" cmd.exe /c "git cherry-pick origin/$($branchName) --allow-empty 2>&1"
if(-not $?){ if(-not $?){
throw "Failed merge of $($branchName)" throw "Failed merge of $($branchName)"
} }