From 11b81575c51c02a979588df1e06b73a6db2e38c1 Mon Sep 17 00:00:00 2001
From: Richard Earnshaw <rearnsha@arm.com>
Date: Mon, 13 Jan 2020 18:37:55 +0000
Subject: Revert "contrib: Add in the default push rule which was overridden"

This reverts commit b60563a8bf18b5a49431b5913f32f5c5ff8319d9.

Doesn't work as expected.
---
 contrib/git-fetch-vendor.sh | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

(limited to 'contrib/git-fetch-vendor.sh')

diff --git a/contrib/git-fetch-vendor.sh b/contrib/git-fetch-vendor.sh
index abb844dbc6a..5e1b1f0a854 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
-- 
cgit v1.2.1