Skip to content

Commit 2962099

Browse files
authored
Prepare scripts for the master to main migration. (flutter#29371)
It changes master branch with main to prepare for the migration. This change will be landed in synchronization with changes to modify the engine default branch to main. Bug: flutter#90476
1 parent 5211466 commit 2962099

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ci/bin/format.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -804,7 +804,7 @@ Future<String> _getDiffBaseRevision(ProcessManager processManager, Directory rep
804804
if (upstreamUrl.isEmpty) {
805805
upstream = 'origin';
806806
}
807-
await _runGit(<String>['fetch', upstream, 'master'], processRunner);
807+
await _runGit(<String>['fetch', upstream, 'main'], processRunner);
808808
String result = '';
809809
try {
810810
// This is the preferred command to use, but developer checkouts often do

tools/clang_tidy/lib/src/git_repo.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class GitRepo {
1818
List<io.File>? _changedFiles;
1919

2020
/// Returns a list of all non-deleted files which differ from the nearest
21-
/// merge-base with `master`. If it can't find a fork point, uses the default
21+
/// merge-base with `main`. If it can't find a fork point, uses the default
2222
/// merge-base.
2323
///
2424
/// This is only computed once and cached. Subsequent invocations of the
@@ -31,15 +31,15 @@ class GitRepo {
3131
defaultWorkingDirectory: root,
3232
);
3333
final ProcessRunnerResult fetchResult = await processRunner.runProcess(
34-
<String>['git', 'fetch', 'upstream', 'master'],
34+
<String>['git', 'fetch', 'upstream', 'main'],
3535
failOk: true,
3636
);
3737
if (fetchResult.exitCode != 0) {
3838
await processRunner.runProcess(<String>[
3939
'git',
4040
'fetch',
4141
'origin',
42-
'master',
42+
'main',
4343
]);
4444
}
4545
final Set<String> result = <String>{};

tools/gen_objcdoc.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jazzy \
4646
--author Flutter Team\
4747
--author_url 'https://flutter.io'\
4848
--github_url 'https://github.com/flutter'\
49-
--github-file-prefix 'http://github.com/flutter/engine/blob/master'\
49+
--github-file-prefix 'http://github.com/flutter/engine/blob/main'\
5050
--module-version 1.0.0\
5151
--xcodebuild-arguments --objc,"$FLUTTER_UMBRELLA_HEADER",--,-x,objective-c,-isysroot,"$(xcrun --show-sdk-path --sdk iphonesimulator)",-I,"$(pwd)"\
5252
--module Flutter\

0 commit comments

Comments
 (0)