git targets: failsafe push develop

ohhmm · Sep 29, 2024 · 84140ec · 84140ec
1 parent f9a6810
commit 84140ec
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/cmake/gitect.cmake b/cmake/gitect.cmake
@@ -25,6 +25,7 @@ if(GIT_EXECUTABLE)
 	add_custom_target(rebase-main
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 		COMMAND ${GIT_EXECUTABLE} pull --rebase --autostash origin main
+		COMMAND ${GIT_EXECUTABLE} fetch --all
 	)
 	set_target_properties(rebase-main PROPERTIES
 		EXCLUDE_FROM_ALL 1
@@ -114,17 +115,27 @@ if(GIT_EXECUTABLE)
 
 	add_custom_target(push-to-develop
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		COMMAND ${GIT_EXECUTABLE} push origin HEAD:develop
+		COMMAND ${GIT_EXECUTABLE} push origin HEAD:develop || ${GIT_EXECUTABLE} push origin HEAD:refs/heads/develop
 		COMMAND ${GIT_EXECUTABLE} fetch --all
 	)
 	set_target_properties(push-to-develop PROPERTIES
 		EXCLUDE_FROM_ALL 1
 		EXCLUDE_FROM_DEFAULT_BUILD 1
 		FOLDER "util/git")
 
+	add_custom_target(force-push-head
+		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+		COMMAND ${GIT_EXECUTABLE} push -f
+		COMMAND ${GIT_EXECUTABLE} fetch --all
+	)
+	set_target_properties(force-push-head PROPERTIES
+		EXCLUDE_FROM_ALL 1
+		EXCLUDE_FROM_DEFAULT_BUILD 1
+		FOLDER "util/git")
+
 	add_custom_target(force-push-head-to-develop
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		COMMAND ${GIT_EXECUTABLE} push origin HEAD:develop -f
+		COMMAND ${GIT_EXECUTABLE} push origin HEAD:develop -f || ${GIT_EXECUTABLE} push origin HEAD:refs/heads/develop
 		COMMAND ${GIT_EXECUTABLE} fetch --all
 	)
 	set_target_properties(force-push-head-to-develop PROPERTIES
@@ -134,7 +145,7 @@ if(GIT_EXECUTABLE)
 
 	add_custom_target(force-push-head1-to-develop
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		COMMAND ${GIT_EXECUTABLE} push origin HEAD~1:develop -f
+		COMMAND ${GIT_EXECUTABLE} push origin HEAD~1:develop -f || ${GIT_EXECUTABLE} push origin HEAD~1:refs/heads/develop
 		COMMAND ${GIT_EXECUTABLE} fetch --all
 	)
 	set_target_properties(force-push-head1-to-develop PROPERTIES
@@ -144,7 +155,7 @@ if(GIT_EXECUTABLE)
 
 	add_custom_target(force-push-head2-to-develop
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		COMMAND ${GIT_EXECUTABLE} push origin HEAD~2:develop -f
+		COMMAND ${GIT_EXECUTABLE} push origin HEAD~2:develop -f || ${GIT_EXECUTABLE} push origin HEAD~2:refs/heads/develop
 		COMMAND ${GIT_EXECUTABLE} fetch --all
 	)
 	set_target_properties(force-push-head2-to-develop PROPERTIES
@@ -154,7 +165,7 @@ if(GIT_EXECUTABLE)
 
 	add_custom_target(force-push-head3-to-develop
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-		COMMAND ${GIT_EXECUTABLE} push origin HEAD~3:develop -f
+		COMMAND ${GIT_EXECUTABLE} push origin HEAD~3:develop -f || ${GIT_EXECUTABLE} push origin HEAD~3:refs/heads/develop
 		COMMAND ${GIT_EXECUTABLE} fetch --all
 	)
 	set_target_properties(force-push-head3-to-develop PROPERTIES