From adffa26f257536823d1c7ca37a270b53e3835ba0 Mon Sep 17 00:00:00 2001 From: Daniel Donenfeld Date: Tue, 26 Feb 2019 17:00:34 -0800 Subject: [PATCH] Fix git diff invocation by using origin/ branch --- 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 b919331..7a8c758 100644 --- a/asm/scripts/deploy-asm.ps1 +++ b/asm/scripts/deploy-asm.ps1 @@ -19,7 +19,7 @@ function collectAsm { } #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 $?){ # Use cherry-pick as the asm branches only have a single commit cmd.exe /c "git cherry-pick origin/$($branchName) --allow-empty 2>&1"