Installer: detect manually-configured default branch #515
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A full Git for Windows SDK is a bit of an overkill if all one wants to do is to fiddle with the installer a bit. With this change, it is possible to fiddle with the individual "wizard pages" of the installer, e.g. via scalar clone https://github.com/git-for-windows/build-extra cd build-extra/src git sparse-checkout add installer cd installer Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
When a user configures the default branch name manually, i.e. edits the system config themselves, the Git for Windows installer currently resets it to whatever was specified when running the installer previously. This is inconsistent with the way other defaults are inferred from the system config, say, `core.symlinks`. Let's make it consistent by interpreting the current value of `init.defaultBranch` (if configured). This addresses git-for-windows/git#4525. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
rimrul
approved these changes
Aug 7, 2023
|
/add relnote bug When The workflow run was started |
github-actions bot
pushed a commit
that referenced
this pull request
Aug 7, 2023
When `init.defaultBranch` is changed manually in the system config, subsequent Git for Windows upgrades [would overwrite that change](git-for-windows/git#4525). This has been [fixed](#515). Signed-off-by: gitforwindowshelper[bot] <gitforwindowshelper-bot@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
As reported in git-for-windows/git#4525, during upgrades the Git for Windows installer may overwrite the current default branch name if it has been set manually in the system config (as opposed to configuring it in the previous Git for Windows installer run).
This PR addresses that by letting the system config override the values from the previous installer run.