Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/sync/sync.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@
# way more than once will result in the same commit hashes, otherwise multiple
# copies of the version control history will be included in the repository.
#
# [1]: <https://github.com/mozilla/gecko-dev/> mirrored from
# <https://hg.mozilla.org/mozilla-central>
# [2]: <https://github.com/mozilla/gecko-dev/>
# [1]: <https://github.com/mozilla-firefox/firefox/>.
# [2]: <https://github.com/servo/webrender/>
set -eux

root_dir=$(pwd)
Expand Down Expand Up @@ -61,7 +60,7 @@ fi

step "Cloning upstream if needed"
if ! [ -e upstream ]; then
git clone --bare --single-branch --progress https://github.com/mozilla/gecko-dev.git upstream
git clone --bare --single-branch --progress https://github.com/mozilla-firefox/firefox.git upstream
fi

step "Updating upstream"
Expand All @@ -80,7 +79,7 @@ git fetch filtered-upstream

step "Resetting 'upstream' branch to filtered repository HEAD"
git switch -c upstream
git reset --hard filtered-upstream/master
git reset --hard filtered-upstream/main

step Pushing new 'upstream'
git push -f origin upstream