From 627c573ac62e6582b4b324bcc6a1283ca48c3906 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Micha=C5=82=20Go=C5=82e=CC=A8biowski-Owczarek?= Date: Fri, 5 Feb 2021 22:00:56 +0100 Subject: [PATCH] Build: Rename master to main across the repository The default branch was updated, this updates the remaining occurrences in code & comments. Closes gh-4838 (cherry picked from commit 8ae477a432f0924cd4bd3bdeaef2c4c15e483a8f) --- CONTRIBUTING.md | 6 +++--- README.md | 6 +++--- build/release/dist.js | 8 ++++---- package.json | 2 +- test/unit/offset.js | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 18c6bc802..71fc258e8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -85,16 +85,16 @@ Change directory to the newly created dir jquery/ $ cd jquery ``` -Add the jQuery master as a remote. I label mine "upstream" +Add the jQuery main as a remote. I label mine "upstream" ```bash $ git remote add upstream git://github.com/jquery/jquery.git ``` -Get in the habit of pulling in the "upstream" master to stay up to date as jQuery receives new commits +Get in the habit of pulling in the "upstream" main to stay up to date as jQuery receives new commits ```bash -$ git pull upstream master +$ git pull upstream main ``` Run the build script diff --git a/README.md b/README.md index fd6630eaa..f36cefef2 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ Some example modules that can be excluded are: As a special case, you may also replace Sizzle by using a special flag `grunt custom:-sizzle`. -- **sizzle**: The Sizzle selector engine. When this module is excluded, it is replaced by a rudimentary selector engine based on the browser's `querySelectorAll` method that does not support jQuery selector extensions or enhanced semantics. See the [selector-native.js](https://github.com/jquery/jquery/blob/master/src/selector-native.js) file for details. +- **sizzle**: The Sizzle selector engine. When this module is excluded, it is replaced by a rudimentary selector engine based on the browser's `querySelectorAll` method that does not support jQuery selector extensions or enhanced semantics. See the [selector-native.js](https://github.com/jquery/jquery/blob/main/src/selector-native.js) file for details. *Note*: Excluding Sizzle will also exclude all jQuery selector extensions (such as `effects/animatedSelector` and `css/hiddenVisibleSelectors`). @@ -227,7 +227,7 @@ As the source code is handled by the Git version control system, it's useful to If you want to purge your working directory back to the status of upstream, the following commands can be used (remember everything you've worked on is gone after these): ```bash -git reset --hard upstream/master +git reset --hard upstream/main git clean -fdx ``` @@ -285,7 +285,7 @@ throws( block, [expected], [message] ); ``` -Test Suite Convenience Methods Reference (See [test/data/testinit.js](https://github.com/jquery/jquery/blob/master/test/data/testinit.js)) +Test Suite Convenience Methods Reference (See [test/data/testinit.js](https://github.com/jquery/jquery/blob/main/test/data/testinit.js)) ------------------------------ ### Returns an array of elements with the given IDs ### diff --git a/build/release/dist.js b/build/release/dist.js index 2f9078d8c..3bbccd41a 100644 --- a/build/release/dist.js +++ b/build/release/dist.js @@ -30,9 +30,9 @@ module.exports = function( Release, files, complete ) { Release.exec( `git clone ${ distRemote } ${ Release.dir.dist }`, "Error cloning repo." ); - // Distribution always works on master + // Distribution always works on main Release.chdir( Release.dir.dist ); - Release.exec( "git checkout master", "Error checking out branch." ); + Release.exec( "git checkout main", "Error checking out branch." ); console.log(); } @@ -144,8 +144,8 @@ module.exports = function( Release, files, complete ) { Release.exec( `git push ${ Release.isTest ? " --dry-run" : "" - } ${ distRemote } master --tags`, - "Error pushing master and tags to git repo." + } ${ distRemote } main --tags`, + "Error pushing main and tags to git repo." ); // Set repo for npm publish diff --git a/package.json b/package.json index 3db6d1b58..65cd587bd 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "homepage": "https://jquery.com", "author": { "name": "OpenJS Foundation and other contributors", - "url": "https://github.com/jquery/jquery/blob/master/AUTHORS.txt" + "url": "https://github.com/jquery/jquery/blob/main/AUTHORS.txt" }, "repository": { "type": "git", diff --git a/test/unit/offset.js b/test/unit/offset.js index 5607ddaf9..814de29a9 100644 --- a/test/unit/offset.js +++ b/test/unit/offset.js @@ -69,7 +69,7 @@ QUnit.test( "disconnected element", function( assert ) { var result = jQuery( document.createElement( "div" ) ).offset(); - // These tests are solely for master/compat consistency + // These tests are solely for main/compat consistency // Retrieving offset on disconnected/hidden elements is not officially // valid input, but will return zeros for back-compat assert.equal( result.top, 0, "Retrieving offset on disconnected elements returns zeros (gh-2310)" ); @@ -86,7 +86,7 @@ QUnit.test( "hidden (display: none) element", function( assert ) { node.remove(); - // These tests are solely for master/compat consistency + // These tests are solely for main/compat consistency // Retrieving offset on disconnected/hidden elements is not officially // valid input, but will return zeros for back-compat assert.equal( result.top, 0, "Retrieving offset on hidden elements returns zeros (gh-2310)" ); @@ -484,7 +484,7 @@ testIframe( "scroll", "offset/scroll.html", function( assert, $, win ) { assert.equal( $( "#scroll-1-1" ).offset().top, 11, "jQuery('#scroll-1-1').offset().top" ); assert.equal( $( "#scroll-1-1" ).offset().left, 11, "jQuery('#scroll-1-1').offset().left" ); - // These tests are solely for master/compat consistency + // These tests are solely for main/compat consistency // Retrieving offset on disconnected/hidden elements is not officially // valid input, but will return zeros for back-compat assert.equal( $( "#hidden" ).offset().top, 0, "Hidden elements do not subtract scroll" ); -- 2.39.5