diff options
| author | Craig Scott <craig.scott@crascit.com> | 2022-02-21 07:19:16 (GMT) |
|---|---|---|
| committer | Craig Scott <craig.scott@crascit.com> | 2022-02-21 07:28:46 (GMT) |
| commit | dec997f04e70f02c69dbe601542a4061c0bfabb1 (patch) | |
| tree | 6a23608ea5b92463ab0c447897c71a90b2fab797 /Modules/ExternalProject | |
| parent | 704e87ee8cf8f903aaaeaf12080ecc69703a7512 (diff) | |
| download | CMake-dec997f04e70f02c69dbe601542a4061c0bfabb1.zip CMake-dec997f04e70f02c69dbe601542a4061c0bfabb1.tar.gz CMake-dec997f04e70f02c69dbe601542a4061c0bfabb1.tar.bz2 | |
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
Diffstat (limited to 'Modules/ExternalProject')
| -rw-r--r-- | Modules/ExternalProject/gitupdate.cmake.in | 2 |
1 files changed, 1 insertions, 1 deletions
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 |