From 2d1a67d3b09a069aa47f74d0f9f92159ef29c54e Mon Sep 17 00:00:00 2001 From: Patrick McCarty Date: Tue, 19 Oct 2021 11:55:01 -0700 Subject: [PATCH] Revise handling of autospec repo Always clone autospec from the upstream clearlinux/autospec github repo regardless of whether a gitolite instance is configured. Also, do not set the repo's pushurl, since the expectation is for contributors to push changes to github forks of autospec, not directly to the upstream repo. Signed-off-by: Patrick McCarty --- Makefile.toplevel | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Makefile.toplevel b/Makefile.toplevel index 25c6e85..155d7a3 100644 --- a/Makefile.toplevel +++ b/Makefile.toplevel @@ -31,11 +31,13 @@ $(proj_PKGS): @proj=$(patsubst proj_%,%,$@); \ [ -d projects/$$proj ] || ( \ echo "Checking out: projects/$$proj"; \ - git clone $(PRJ_BASE_URL)/$$proj projects/$$proj; \ - cd projects/$$proj; \ if [ "$$proj" = "autospec" ] ; then \ - git remote set-url --push origin git@github.com:clearlinux/autospec.git; \ + git clone https://github.com/clearlinux/autospec.git projects/autospec; \ else \ + git clone $(PRJ_BASE_URL)/$$proj projects/$$proj; \ + fi; \ + cd projects/$$proj; \ + if [ "$$proj" != "autospec" ] ; then \ $(call gitoliteurl,projects/$$proj); \ fi; \ $(call subjectprefix,$$proj); \ @@ -76,9 +78,7 @@ ${PULL_PKGS}: fi ; \ git --no-pager log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit $$O..$$N; echo; \ fi ; \ - if [ "$$p" = "projects/autospec" ] ; then \ - git remote set-url --push origin git@github.com:clearlinux/autospec.git; \ - else \ + if [ "$$p" != "projects/autospec" ] ; then \ $(call gitoliteurl,$$p); \ fi ; \ else \