| Age | Commit message (Collapse) | Author |
|
The version message may contain other info such as the distribution.
e.g.:
```console
$ /usr/bin/git --version
git version 2.50.1 (Apple Git-155)
```
|
|
|
|
This test has been reliably failing on recent trunk versions.
See: <https://github.com/ruby/ruby/actions/runs/19519712433/job/55880266450#step:14:120>
|
|
|
|
Find interesting commits by following parents instead of relying on
"git log".
If we encounter a merge commit that may contain a conflict resolution,
fall back to cherry-picking the merge commit as a whole rather than
replaying each individual commit. The sync commit will include a
shortlog for the squashed commits in that case.
|
|
No behavior change is intended by this change.
|
|
Use "git commit --amend" instead of "git filter-branch" since we only
need to handle one commit at HEAD.
|
|
No one uses `sync_default_gems_with` on other platforms; it is used by
the dedicated workflow and a few developers only.
|
|
|
|
|
|
When something went wrong and git launches editor, and a editor chosen
was terminal-based, a test run unnoticeably hangs.
As we intend editors not to be ran with --no-edit, GIT_EDITOR should be
defaulted to `false` so let Git command fails when it attempts to start a
editor. This allows catching such unintentional behaviour in test suite.
(Note: Prior to Git v2.32.0, git cherry-pick --no-edit doesn't work for
conflict resolution so currently the test hangs when older Git is in use.
https://github.com/git/git/commit/39edfd5cbc4d168db19ec1bc867d78ec7211ec39
i.e. Ubuntu 20.04, Debian Bullseye doesn't satisfy this prerequisite.)
|
|
After editing a conflict, continue without removed files.
|
|
|
|
|
|
The case of 7fc73ab5f6fbe46655855079954b26dcc14576b3, which modified
`.gitignore` and `.github/workflows/main.yml`. Both files need to be
rejected and restored, but since the latter file was not there before,
`git checkout` failed and the former file could not be restored along
with it. To fix this failure, restore the ignored files one by one.
|
|
|
|
When multiple files changed in the same directory to be removed, the
first file only was removed from changed set.
|
|
|
|
Referencing always after conversion to a symbol, and yielded gem name
is always converted to a string.
|
|
Do not add directories which would let chkbuild fires accidentally, to
just under `test`. The "fixtures" directory is often used to place
test stuffs.
Notes:
Merged: https://github.com/ruby/ruby/pull/8214
|
|
|
|
As well as `GIT_CONFIG_GLOBAL`, which is supported since git 2.32.
|
|
This reverts commit b0f44cfa5da53b90817732cb25b4d3a1cddecb89.
|
|
With older git, as `GIT_CONFIG_GLOBAL` environment variable is not
supported, these tests clobber user's configurations.
|
|
The -b flag is available since 2.28, but Ubuntu 20.04 uses 2.25.
Notes:
Merged: https://github.com/ruby/ruby/pull/7770
|
|
Get rid of accidents like 67feb782f947046f65951303893713052a19a546.
Notes:
Merged: https://github.com/ruby/ruby/pull/7601
|
|
cf0b413ef8b794ef6e7436f22fd5a998050dada9
|
|
Notes:
Merged: https://github.com/ruby/ruby/pull/6820
|
|
Notes:
Merged: https://github.com/ruby/ruby/pull/6820
|