From bcd7b60df70aa0727043db09e84ad2ab1da18fa8 Mon Sep 17 00:00:00 2001
From: Daniel Donenfeld <dadonenf@microsoft.com>
Date: Sat, 16 Feb 2019 21:46:29 -0800
Subject: [PATCH] Allow empty with git-cherry-pick

---
 asm/scripts/deploy-asm.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/asm/scripts/deploy-asm.ps1 b/asm/scripts/deploy-asm.ps1
index cc352bc..75f9aae 100644
--- a/asm/scripts/deploy-asm.ps1
+++ b/asm/scripts/deploy-asm.ps1
@@ -19,7 +19,7 @@ function collectAsm {
         }
 
         # 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 $?){
             throw "Failed merge of $($branchName)"
         }