We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
1 parent 0652dee commit dda0abfCopy full SHA for dda0abf
1 file changed
src/Git.cmake
@@ -457,8 +457,17 @@ function(git_switch_back)
457
458
execute_process(
459
COMMAND "${GIT_EXECUTABLE}" "switch" "-" WORKING_DIRECTORY "${_fun_REPOSITORY_PATH}"
460
- COMMAND_ERROR_IS_FATAL LAST
+ RESULT_VARIABLE _switch_back_result
461
)
462
+
463
+ # if the switch back failed, try to checkout the previous branch
464
+ if(NOT ${_switch_back_result} EQUAL 0)
465
+ message(STATUS "Switch back failed. Trying to checkout previous branch")
466
+ execute_process(
467
+ COMMAND "${GIT_EXECUTABLE}" "checkout" "-" WORKING_DIRECTORY "${_fun_REPOSITORY_PATH}"
468
+ COMMAND_ERROR_IS_FATAL LAST
469
+ )
470
+ endif()
471
endif()
472
endfunction()
473
0 commit comments