2 files changed, 6 insertions, 1 deletions

diff --git a/docs/release-process.md b/docs/release-process.md
index 8cec2b47..a8c41c52 100644
--- a/docs/release-process.md
+++ b/docs/release-process.md
@@ -96,6 +96,9 @@ If that tag is valid, then repo will warn and use that commit instead.
 
 If that tag cannot be verified, it gives up and forces the user to resolve.
 
+If env variable `REPO_SKIP_SELF_UPDATE` is defined, this will
+bypass the self update algorithm.
+
 ### Force an update
 
 The `repo selfupdate` command can be used to force an immediate update.
diff --git a/subcmds/sync.py b/subcmds/sync.py
index 00fee776..decf559b 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -958,7 +958,9 @@ later is required to fix a server side protocol bug.
         if not success:
             err_event.set()
 
-        _PostRepoFetch(rp, opt.repo_verify)
+        # Call self update, unless requested not to
+        if os.environ.get("REPO_SKIP_SELF_UPDATE", "0") == "0":
+            _PostRepoFetch(rp, opt.repo_verify)
         if opt.network_only:
             # Bail out now; the rest touches the working tree.
             if err_event.is_set():