Use git config to make overlapping remotes in a test repo
#2132
+10
−4
Conversation
This file contains hidden or 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
Starting in Git 2.51.0, at least one of the `git remote` commands in the `make_remote_config_repos.sh` fixutre script fails, which causes a subsequently run command depending on it to fail. This is the cause of the CI failures observed in GitoxideLabs#2130. But when any command fails, the intention is that the script fails fast. To help achieve this, `set -e` is used. But the rules for `set -e` have a number of exceptions. At least in some versions of `bash`, the way `&&` was being used kept it from failing fast. This changes that to run the commands separately, surfacing the specific `git remote` command that fails, rather than a subsequent command that fails later as a result of the first failure.
Instead of `git remote`. Since Git 2.51.0, path collisions in remote names are automatically detected and rejected when `git remote add` is used to attempt to add them, since creating such collisions is usually unintentional: git/git@a5a727c However, we deliberately do this in our test suite, in the `make_remote_config_repos.sh` fixture script. When Git 2.51.0 came to be used on CI, some new test failures arose as a result, as observed in GitoxideLabs#2130. This fixes the script by using two `git config` commands rather than a `git remote` command to produce the overlap. This technique is (intentionally) still allowed in Git 2.51.0.
This was regenerated via `cargo nextest --workspace --no-fail-fast` and verifying that there were no failures, then committing the one changed file, on an Ubuntu 24.04 LTS x86_64 system with Git 2.51.0 from the git-core PPA.
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.
Instead of
git remote.Since Git 2.51.0, path collisions in remote names are automatically detected and rejected when
git remote addis used to attempt to add them, since creating such collisions is usually unintentional: git/git@a5a727cHowever, we deliberately do this in our test suite, in the
make_remote_config_repos.shfixture script. When Git 2.51.0 came to be used on CI, some new test failures arose as a result, as observed in #2130.This fixes the script by using two
git configcommands rather than agit remotecommand to produce the overlap. This technique is (intentionally) still allowed in Git 2.51.0.