diff options
| author | Richard Earnshaw <rearnsha@arm.com> | 2020-01-13 18:37:55 +0000 |
|---|---|---|
| committer | Richard Earnshaw <rearnsha@arm.com> | 2020-01-13 18:43:28 +0000 |
| commit | 11b81575c51c02a979588df1e06b73a6db2e38c1 (patch) | |
| tree | 3f837476f2ea6c54d96b35a6eef37f2f15a8ea48 /contrib | |
| parent | b60563a8bf18b5a49431b5913f32f5c5ff8319d9 (diff) | |
| download | gcc-11b81575c51c02a979588df1e06b73a6db2e38c1.zip gcc-11b81575c51c02a979588df1e06b73a6db2e38c1.tar.gz gcc-11b81575c51c02a979588df1e06b73a6db2e38c1.tar.bz2 | |
Revert "contrib: Add in the default push rule which was overridden"
This reverts commit b60563a8bf18b5a49431b5913f32f5c5ff8319d9.
Doesn't work as expected.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 9 | ||||
| -rwxr-xr-x | contrib/gcc-git-customization.sh | 4 | ||||
| -rwxr-xr-x | contrib/git-fetch-vendor.sh | 10 |
3 files changed, 12 insertions, 11 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 32ed283..7995644 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,5 +1,14 @@ 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 is lost by adding a custom push rule. * git-fetch-vendor.sh: Likewise, also remove '+' from push specs. diff --git a/contrib/gcc-git-customization.sh b/contrib/gcc-git-customization.sh index 6665bdd..3b9d79d 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 abb844d..5e1b1f0 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 |