Rename default branch to ‘main’.

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

CONTRIBUTING.md

@@ -17,4 +17,4 @@
 
 [open-issues]: https://github.com/zulip/zulip-mobile/issues
 [commit-style]: https://zulip.readthedocs.io/en/latest/contributing/version-control.html
-[style-guide]: https://github.com/zulip/zulip-mobile/blob/master/docs/style.md
+[style-guide]: https://github.com/zulip/zulip-mobile/blob/main/docs/style.md

README.md

@@ -2,7 +2,7 @@
 
 [![CI](https://github.com/zulip/zulip-mobile/actions/workflows/ci.yml/badge.svg)](https://github.com/zulip/zulip-mobile/actions/workflows/ci.yml?query=branch%3Amain)
 [![Zulip chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://chat.zulip.org/#narrow/stream/mobile)
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/zulip/zulip-mobile/blob/master/CONTRIBUTING.md)
+[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](https://github.com/zulip/zulip-mobile/blob/main/CONTRIBUTING.md)
 
 Zulip Mobile is the official mobile Zulip client, supporting both iOS
 and Android.

android/app/src/main/java/com/zulipmobile/TextCompressionModule.java

@@ -15,7 +15,7 @@
 import java.util.zip.Inflater;
 
 // TODO: Write unit tests; see
-//   https://github.com/zulip/zulip-mobile/blob/master/docs/howto/testing.md#unit-tests-android.
+//   https://github.com/zulip/zulip-mobile/blob/main/docs/howto/testing.md#unit-tests-android.
 class TextCompressionModule extends ReactContextBaseJavaModule {
   public TextCompressionModule(ReactApplicationContext reactContext) {
     super(reactContext);

docs/architecture/our-rn.md

@@ -15,11 +15,11 @@ The workflow within that repo is:
   by other people in PRs to React Native.)  For example, `0.55.4-zulip` is a
   branch on top of `v0.55.4`, which is the tag for the 0.55.4 release.
 
-* Each of these branches works a lot like the `master` branch in this
+* Each of these branches works a lot like the `main` branch in this
   zulip/zulip-mobile repo or in the zulip/zulip repo.  The branch is a
   linear sequence of commits, with no merges; and it advances only by adding
   new commits, never by rebasing or rewinding.
 
 * Contributing to one of these branches works just like contributing to
-  `master` in this zulip/zulip-mobile repo; prepare a branch in your own
+  `main` in this zulip/zulip-mobile repo; prepare a branch in your own
   GitHub fork, and send a PR.

docs/changelog.md

@@ -796,7 +796,7 @@ experience.
 
 ### Highlights for developers
 
-This is a regular release from the master branch following 26.18.141.
+This is a regular release from the main branch following 26.18.141.
 In addition to the changes mentioned here, it includes the changes
 that were cherry-picked for 26.19.142.
 

docs/howto/editor.md

@@ -68,7 +68,7 @@ Take a look through some of VS Code's docs.  In particular:
 #### Confirm our workspace settings took effect
 
 For the extensions to work properly, make sure that VS Code has recognized
-[our settings file](https://github.com/zulip/zulip-mobile/tree/master/.vscode/settings.json)
+[our settings file](https://github.com/zulip/zulip-mobile/tree/main/.vscode/settings.json)
 in the zulip-mobile repository. Usually, this should happen automatically
 when you open the `zulip-mobile` folder in VS Code.
 

docs/howto/git.md

@@ -84,8 +84,8 @@ Use some of `git log`'s many features to filter down to commits you
 care about.  For example:
 
 * Filter to a range of commits with `git log A..B`.  E.g., to reread your
-  current branch relative to upstream master, you might say
-  `git log --stat -p upstream/master..`, or `git log --stat -p @{u}..`.
+  current branch relative to upstream main, you might say
+  `git log --stat -p upstream/main..`, or `git log --stat -p @{u}..`.
   (Greg has the latter aliased as `git usp`, and types it constantly.)
 
 * Filter to changes touching certain files or directories:
@@ -109,8 +109,8 @@ care about.  For example:
 
 Try all those `git log` filtering features in your graphical client -- it
 may even support the very same command-line options to do it.  For
-example, `gitk upstream/master..` shows basically the same information as
-`git log --stat -p upstream/master..`, but graphically.
+example, `gitk upstream/main..` shows basically the same information as
+`git log --stat -p upstream/main..`, but graphically.
 
 
 ### 5. Git a summary, with `git log --oneline`

docs/howto/ios-tips.md

@@ -142,7 +142,7 @@ the insecure `http://`, you'll need to tell the app to make an
 exception under iOS's "App Transport Security" (ATS), either to allow
 access any host with `http://`, or just to specific domains.
 
-These exceptions should never be committed to master, as there aren't
+These exceptions should never be committed to main, as there aren't
 any insecure domains we want to connect to in production.
 
 To disable ATS restrictions for all network connections, add the

docs/howto/profiling.md

@@ -158,12 +158,12 @@ git remote add greg [email protected]:gnprice/zulip-mobile
 git fetch greg dev-perf-monitor
 ```
 
-[demo branch]: https://github.com/zulip/zulip-mobile/compare/master...gnprice:dev-perf-monitor
+[demo branch]: https://github.com/zulip/zulip-mobile/compare/main...gnprice:dev-perf-monitor
 
 Then probably rebase it to whatever you were working on; and rerun
 `yarn`:
 ```
-git cherry-pick upstream/master..greg/dev-perf-monitor
+git cherry-pick upstream/main..greg/dev-perf-monitor
 yarn
 ```
 

docs/howto/push-notifications.md

@@ -240,7 +240,7 @@ on that is
 Now, restart the server, and you should be receiving notifications on
 your iOS development build! Be sure mobile notification settings are
 on, using the web app's settings interface. (You're all set to do this
-if your branch is up-to-date with a version of `master` from 2020-03
+if your branch is up-to-date with a version of `main` from 2020-03
 or later; if not, you'll need the changes in [this
 commit](https://github.com/zulip/zulip/commit/23ba2b63c5c10f43b02a2bb2c470cc6ff597d839)).
 If it's not working, please say so in
@@ -293,7 +293,7 @@ More specifically, the rule appears to be:
    alpha and/or beta releases, but the build number must strictly
    increase.
 
-So if the last version in master is already in the App Store (and not
+So if the last version in main is already in the App Store (and not
 still in alpha or beta), then we'll want to:
 
  * Increment the user-facing version number.

docs/howto/release.md

@@ -153,7 +153,7 @@ simple terminology for the process we follow with both.
 * Remember to switch back to a branch without the Sentry client key:
 
   ```
-  git checkout master
+  git checkout main
   ```
 
 [play-internal-testing]: https://play.google.com/console/developers/8060868091387311598/app/4976350040864490411/tracks/internal-testing
@@ -237,7 +237,7 @@ simple terminology for the process we follow with both.
 * Remember to switch back to a branch without the Sentry client key:
 
   ```
-  git checkout master
+  git checkout main
   ```
 
 [app-store-connect]: https://appstoreconnect.apple.com/
@@ -466,7 +466,7 @@ vulnerable.
 * Wait for the release to be approved for TestFlight.  (On failure, try to
   fix, then resubmit.)
 
-* Push the tagged commit, and also push the corresponding changes to master.
+* Push the tagged commit, and also push the corresponding changes to main.
 
 * Upload the APK to GitHub as usual.
 
@@ -530,7 +530,7 @@ script Sentry supplies.)
    ```
    $ git checkout -b release-secrets
    $ git commit -am 'SECRET: Add Sentry client key.'
-   $ git checkout master
+   $ git checkout main
    ```
 
    Then, as described in the main release steps above, when making a

src/actionTypes.js

@@ -204,7 +204,7 @@ export type MessageFetchStartAction = {|
  * that world, so, we take care to catch those errors and dispatch
  * this action there too. See discussion [2] for implementation notes.
  *
- * [1] https://github.com/zulip/zulip-mobile/blob/master/docs/architecture/crunchy-shell.md
+ * [1] https://github.com/zulip/zulip-mobile/blob/main/docs/architecture/crunchy-shell.md
  * [2] https://chat.zulip.org/#narrow/stream/243-mobile-team/topic/.23M4156.20Message.20List.20placeholders/near/937480
  */
 type MessageFetchErrorAction = {|

src/boot/store.js

@@ -381,7 +381,7 @@ function listMiddleware() {
       // See upstream docs:
       //   https://github.com/LogRocket/redux-logger
       // and ours:
-      //   https://github.com/zulip/zulip-mobile/blob/master/docs/howto/debugging.md#redux-logger
+      //   https://github.com/zulip/zulip-mobile/blob/main/docs/howto/debugging.md#redux-logger
       createLogger({
         duration: true,
         // Example options to add for more focused information, depending on

src/message/fetchActions.js

@@ -414,7 +414,7 @@ export async function tryFetch<T>(
  * updates, calling its `/register` endpoint and starting an async loop to
  * poll for events.  For background on the Zulip event system and how we use
  * it, see docs from the client-side perspective:
- *   https://github.com/zulip/zulip-mobile/blob/master/docs/architecture/realtime.md
+ *   https://github.com/zulip/zulip-mobile/blob/main/docs/architecture/realtime.md
  * and a mainly server-side perspective:
  *   https://zulip.readthedocs.io/en/latest/subsystems/events-system.html
  *

src/reduxTypes.js

@@ -141,7 +141,7 @@ export type FlagName = $Keys<FlagsState>;
  * event system to get a complete snapshot and to maintain it incrementally.
  * See `doInitialFetch` for discussion, and see our docs from the
  * client-side perspective:
- *   https://github.com/zulip/zulip-mobile/blob/master/docs/architecture/realtime.md
+ *   https://github.com/zulip/zulip-mobile/blob/main/docs/architecture/realtime.md
  * and a mainly server-side perspective:
  *   https://zulip.readthedocs.io/en/latest/subsystems/events-system.html
  * As a result, there are very few types of data we need to go fetch from

tools/bump-version

@@ -58,7 +58,7 @@ if [ -n "$had_uncommitted" ]; then
         echo "Then tag the commit:"
         echo "  git tag ${tag_name}"
         echo "inspect the result, and push:"
-        echo "  git push upstream master ${tag_name}"
+        echo "  git push upstream main ${tag_name}"
     } >&2
     exit 1
 fi
@@ -71,5 +71,5 @@ git tag "${tag_name}"
     echo
     echo "Committed and tagged."
     echo "Inspect the result, then push; for example:"
-    echo "  git push upstream master ${tag_name}"
+    echo "  git push upstream main ${tag_name}"
 } >&2

tools/info

@@ -11,7 +11,7 @@ EOF
 }
 
 upstream_ref() {
-    echo refs/remotes/"$(upstream_remote_name)"/master
+    echo refs/remotes/"$(upstream_remote_name)"/main
 }
 
 base_commit() {
@@ -23,7 +23,7 @@ base_commit() {
 # usage: files_changed [TIP [UPSTREAM]]
 #
 # Lists files that have changed in TIP (default: current worktree)
-# relative to UPSTREAM (default: upstream/master or origin/master).
+# relative to UPSTREAM (default: upstream/main or origin/main).
 #
 # Excludes files that no longer exist in TIP.
 files_changed() {

tools/tx-sync

@@ -103,7 +103,7 @@ Thanks as always to our kind volunteer translators.
 
 Has a new language made major progress?  See docs on updating
 the languages offered in the UI:
-  https://github.com/zulip/zulip-mobile/blob/master/docs/howto/translations.md
+  https://github.com/zulip/zulip-mobile/blob/main/docs/howto/translations.md
 EOF
 else
     err_echo 'Step 1: ...none.'
@@ -126,7 +126,7 @@ EOF
     cat >&2 <<EOF
 
 To finish adding it, see docs:
-  https://github.com/zulip/zulip-mobile/blob/master/docs/howto/translations.md
+  https://github.com/zulip/zulip-mobile/blob/main/docs/howto/translations.md
 
 Then rerun this script to complete the rest of the sync.
 EOF