diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 32ed283e08e162e774d5d44495b8537882f3416c..79956444091570a927b05f5129337f7773647bca 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -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 diff --git a/contrib/gcc-git-customization.sh b/contrib/gcc-git-customization.sh index 6665bddeb48c24069b1e4f615fdc64ee24b2e130..3b9d79d3d38e29475b340e1b94a057f306f33712 100755 --- a/contrib/gcc-git-customization.sh +++ b/contrib/gcc-git-customization.sh @@ -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/*" diff --git a/contrib/git-fetch-vendor.sh b/contrib/git-fetch-vendor.sh index abb844dbc6a56b27f15c60c4bc101ffa626fa8b6..5e1b1f0a8540365a63c4245cddfc7cd76d93191b 100755 --- a/contrib/git-fetch-vendor.sh +++ b/contrib/git-fetch-vendor.sh @@ -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