From dec997f04e70f02c69dbe601542a4061c0bfabb1 Mon Sep 17 00:00:00 2001 From: Craig Scott Date: Mon, 21 Feb 2022 18:19:16 +1100 Subject: ExternalProject: Remove extra quotes in for-each-ref update step The --format=... argument to git for-each-ref was using a stray pair of single quotes around the format string. These were then part of the output, which caused it to never match the checkout_name. The end result was that a REBASE_CHECKOUT always became a CHECKOUT in all scenarios. Fixes: #23216 --- Modules/ExternalProject/gitupdate.cmake.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Modules/ExternalProject/gitupdate.cmake.in b/Modules/ExternalProject/gitupdate.cmake.in index 0de2372..7896f62 100644 --- a/Modules/ExternalProject/gitupdate.cmake.in +++ b/Modules/ExternalProject/gitupdate.cmake.in @@ -128,7 +128,7 @@ if(git_update_strategy MATCHES "^REBASE(_CHECKOUT)?$") else() execute_process( - COMMAND "@git_EXECUTABLE@" for-each-ref "--format='%(upstream:short)'" "${current_branch}" + COMMAND "@git_EXECUTABLE@" for-each-ref "--format=%(upstream:short)" "${current_branch}" WORKING_DIRECTORY "@work_dir@" OUTPUT_VARIABLE upstream_branch OUTPUT_STRIP_TRAILING_WHITESPACE -- cgit v0.12