procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "contrib: Add in the default push rule which was overridden"

Browse source 
This reverts commit b60563a8bf.

Doesn't work as expected.
This commit is contained in:
Richard Earnshaw 2020-01-13 18:37:55 +00:00
parent b60563a8bf
commit 11b81575c5
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
contrib/ChangeLog
View file

@ -1,3 +1,12 @@
2010-01-13 Richard Earnshaw <rearnsha@arm.com>
Revert:
2010-01-13 Richard Earnshaw <rearnsha@arm.com>
* gcc-git-customization.sh: Add back the default rule that
is lost by adding a custom push rule.
* git-fetch-vendor.sh: Likewise, also remove '+' from push specs.
2010-01-13 Richard Earnshaw <rearnsha@arm.com>
* gcc-git-customization.sh: Add back the default rule that

4
contrib/gcc-git-customization.sh
View file

@ -68,11 +68,7 @@ echo "(local branches starting <prefix>/ can be pushed directly to your"
ask "personal area on the gcc server)" $old_pfx new_pfx
git config "gcc-config.userpfx" "$new_pfx"
# This entry needs to come last, so unset it now, then reset it after the updates.
git config --unset "remote.${upstream}.push" "refs/heads/\\*:refs/heads/\\*"
echo "Setting up tracking for personal namespace $remote_id in remotes/$upstream/${new_pfx}"
git config --replace-all "remote.${upstream}.fetch" "+refs/users/${remote_id}/heads/*:refs/remotes/${upstream}/${new_pfx}/*" ":refs/remotes/${upstream}/${old_pfx}/"
git config --replace-all "remote.${upstream}.fetch" "+refs/users/${remote_id}/tags/*:refs/tags/${new_pfx}/*" ":refs/tags/${old_pfx}/"
git config --replace-all "remote.${upstream}.push" "refs/heads/${new_pfx}/*:refs/users/${remote_id}/heads/*" "^\+?refs/heads/${old_pfx}/"
# Re-add the line deleted above.
git config --add "remote.${upstream}.push" "refs/heads/*:refs/heads/*"

10
contrib/git-fetch-vendor.sh
View file

@ -14,13 +14,9 @@ then
exit 1
fi
# This entry needs to come last, so unset it now, then reset it after the updates.
git config --unset "remote.${upstream}.push" "refs/heads/\\*:refs/heads/\\*"
echo "setting up git to fetch vendor ${vendor} to remotes/${upstream}/${vendor}"
git config --replace-all "remote.${upstream}.fetch" "refs/vendors/${vendor}/heads/*:refs/remotes/${upstream}/${vendor}/*" ":refs/remotes/${upstream}/${vendor}/"
git config --replace-all "remote.${upstream}.fetch" "+refs/vendors/${vendor}/heads/*:refs/remotes/${upstream}/${vendor}/*" ":refs/remotes/${upstream}/${vendor}/"
git config --replace-all "remote.${upstream}.fetch" "+refs/vendors/${vendor}/tags/*:refs/tags/${vendor}/*" ":refs/tags/${vendor}/"
git config --replace-all "remote.${upstream}.push" "refs/heads/${vendor}/*:refs/vendors/${vendor}/heads/*" "^\+?refs/heads/${vendor}/"
# Re-add the line deleted above.
git config --add "remote.${upstream}.push" "refs/heads/*:refs/heads/*"
git config --replace-all "remote.${upstream}.push" "+refs/heads/${vendor}/*:refs/vendors/${vendor}/heads/*" "^\+refs/heads/${vendor}/"
git fetch