[sonic-frr]: Checkout gracefully if branch exists already. (sonic-net…

…#8289) (sonic-net#15434)
mssonicbld · Jun 12, 2023 · 9ae7e3a · 9ae7e3a
1 parent d360ec0
commit 9ae7e3a
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/sonic-frr/Makefile b/src/sonic-frr/Makefile
@@ -10,7 +10,7 @@ STG_BRANCH = stg_temp.$(SUFFIX)
 $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	# Build the package
 	pushd ./frr
-	git checkout -b $(FRR_BRANCH) origin/$(FRR_BRANCH)
+	git checkout -b $(FRR_BRANCH) origin/$(FRR_BRANCH) || git checkout $(FRR_BRANCH)
 	stg branch --create $(STG_BRANCH) $(FRR_TAG)
 	stg import -s ../patch/series
 	tools/tarsource.sh -V -e '-sonic'