This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9746

tests: make test-subrepo-git.t compatible with git's master->main rename
ClosedPublic

Authored by martinvonz on Jan 12 2021, 8:34 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG88dfe1c279bb: tests: make test-subrepo-git.t compatible with git's master->main rename
Summary

Git is about to change the default branch from "master" to
"main". Recent versions has started warning about that, which makes
tests fail. I assume the tests would fail in a different way once the
default has changed. To make us compatible with that name change,
let's set configure the default to be "master". That value makes the
tests still work on older Git version (those where the default branch
name is not configurable).

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Jan 12 2021, 8:34 PM
pulkit accepted this revision.Jan 13 2021, 5:09 AM
This revision is now accepted and ready to land.Jan 13 2021, 5:09 AM

Revision Contents
Changeset List

PathPackages
Mtests/test-subrepo-git.t (4 lines)

Diff 24782

tests/test-subrepo-git.t

$ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
$ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
$ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE $ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE
$ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME
$ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL
$ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE
$ GIT_CONFIG_NOSYSTEM=1; export GIT_CONFIG_NOSYSTEM $ GIT_CONFIG_NOSYSTEM=1; export GIT_CONFIG_NOSYSTEM
set default branch to value compatible with new and old git version
$ git config --global init.defaultBranch master
root hg repo root hg repo
$ hg init t $ hg init t
$ cd t $ cd t
$ echo a > a $ echo a > a
$ hg add a $ hg add a
$ hg commit -m a $ hg commit -m a
$ cd .. $ cd ..