Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fixed git-subrepo and tests if set ff=only #640

Open
wants to merge 4 commits into
base: master
Choose a base branch
from

Conversation

spog
Copy link
Contributor

@spog spog commented Nov 16, 2024

Some tests failed, when ff_only is set in users git configuration; like:
...
test/branch-rev-list-one-path.t .... Died at line 23 in main of test/branch-rev-list-one-path.t
test/branch-rev-list-one-path.t .... No subtests run
test/branch-rev-list.t ............. Died at line 26 in main of test/branch-rev-list.t
test/branch-rev-list.t ............. No subtests run ...

and git configuration is set like:
$ git config --global pull.ff only
$ git config --global merge.ff only

There may be a similar cause of failure described in issue 550.

@spog spog force-pushed the ff_only branch 2 times, most recently from 6add0dc to 05034b1 Compare November 23, 2024 17:56
spog added 4 commits December 1, 2024 20:09
Some tests failed, when ff_only is set in users git configuration;
like:
...
test/branch-rev-list-one-path.t .... Died at line 23 in main of test/branch-rev-list-one-path.t
test/branch-rev-list-one-path.t .... No subtests run
test/branch-rev-list.t ............. Died at line 26 in main of test/branch-rev-list.t
test/branch-rev-list.t ............. No subtests run
...

and git configuration is set like:
    $ git config --global pull.ff only
    $ git config --global merge.ff only
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant