Adding upstream version 127.0.upstream/127.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 2 deletions

diff --git a/dom/media/webrtc/third_party_build/fetch_github_repo.py b/dom/media/webrtc/third_party_build/fetch_github_repo.py
index 8caa55d5c5..1031eb528b 100644
--- a/dom/media/webrtc/third_party_build/fetch_github_repo.py
+++ b/dom/media/webrtc/third_party_build/fetch_github_repo.py
@@ -67,12 +67,16 @@ def fetch_repo(github_path, clone_protocol, force_fetch, tar_path):
             "git remote add upstream https://webrtc.googlesource.com/src", github_path
         )
         run_git("git fetch upstream", github_path)
-        run_git("git merge upstream/master", github_path)
     else:
         print(
             "Upstream remote (https://webrtc.googlesource.com/src) already configured"
         )
 
+    # for sanity, ensure we're on master
+    run_git("git checkout master", github_path)
+    # make sure we successfully fetched upstream
+    run_git("git merge upstream/master", github_path)
+
     # setup upstream branch-heads
     stdout_lines = run_git(
         "git config --local --get-all remote.upstream.fetch", github_path
@@ -87,9 +91,12 @@ def fetch_repo(github_path, clone_protocol, force_fetch, tar_path):
     else:
         print("Upstream remote branch-heads already configured")
 
+    # verify that a (quite old) branch-head exists
+    run_git("git show branch-heads/5059", github_path)
+
     # prevent changing line endings when moving things out of the git repo
     # (and into hg for instance)
-    run_git("git config --local core.autocrlf false")
+    run_git("git config --local core.autocrlf false", github_path)
 
     # do a sanity fetch in case this was not a freshly cloned copy of the
     # repo, meaning it may not have all the mozilla branches present.