diff options
| author | Brad King <brad.king@kitware.com> | 2022-11-11 14:50:55 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2023-01-11 17:11:34 -0500 |
| commit | baa8597076600e93755c6babcd2a5cf1b6edcd19 (patch) | |
| tree | 0f73971a8ed8a9fda735dc0520e413de0033b47e | |
| parent | 9c29d003933163bc6e76c7782ab71db7f5033126 (diff) | |
| download | cmake-baa8597076600e93755c6babcd2a5cf1b6edcd19.tar.gz | |
Tests: Fix CTest.UpdateGIT under repo-local defaultBranch config
The default branch detection added by commit 26ec2e2b0c (Tests: Update
CTest.UpdateGIT test for custom defaultBranch, 2020-12-02,
v3.20.0-rc1~355^2) fails if the test is run inside a Git work tree whose
`.git` directory configures a `defaultBranch` that is different from the
global or system-wide value. Fix the detection to ignore the locally
configured value so that we match the `git init` decision.
| -rw-r--r-- | Tests/CTestUpdateGIT.cmake.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CTestUpdateGIT.cmake.in b/Tests/CTestUpdateGIT.cmake.in index a3ef4ebdbc..7fddaa3031 100644 --- a/Tests/CTestUpdateGIT.cmake.in +++ b/Tests/CTestUpdateGIT.cmake.in @@ -34,7 +34,7 @@ endif() # Adapt to the system default branch name. execute_process( - COMMAND ${GIT} config --get init.defaultBranch + COMMAND ${GIT} --git-dir= config --get init.defaultBranch RESULT_VARIABLE defaultBranchFailed OUTPUT_VARIABLE defaultBranch ERROR_VARIABLE defaultBranchError |