From f2cc170cf5a019f9a711a24bb12df576778f671d Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 18 Dec 2016 12:50:49 +0000 Subject: [PATCH] git-submod.mk: Some improvements Signed-off-by: Jan Lindemann --- make/git-submod.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/make/git-submod.mk b/make/git-submod.mk index 2d551e13..d6496683 100644 --- a/make/git-submod.mk +++ b/make/git-submod.mk @@ -1,3 +1,5 @@ +GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER)@git.jannet.de /opt/ytools/bin/git-srv-admin.sh + all: install: clean: @@ -11,18 +13,19 @@ git-submod-init-remote: @echo "FIXME: Then this target in $(lastword $(MAKEFILE_LIST)) has to do the following:" @echo "FIXME: - Use that," @echo "FIXME: - rename remote \"origin\" to \"upstream\", # git remote rename origin upstream" - @echo "FIXME: - add new remote origin pointing to newly created repo, # git remote add origin ssh://jan@git.jannet.de/srv/git/jan/contrib/" + @echo "FIXME: - add new remote origin pointing to newly created repo, # git remote add origin ssh://$(JANWARE_USER)@git.jannet.de/srv/git/$(JANWARE_USER)/contrib/" @echo "FIXME: - fix remote to push to # git config branch.master.remote origin" @echo "FISME: - set standard branch (should be okay anyway) # git config branch.master.merge refs/heads/master" @echo "FIXME: - push contents there." @exit 1 git-submod-test-init-remote: + $(GIT_SRV_ADMIN_SH) -F contrib create-repo $(PROJECT_DIRNAME) git remote rename origin upstream - git remote add origin ssh://jan@git.jannet.de/srv/git/jan/contrib/$(PROJECT_DIRNAME) + git remote add origin ssh://$(JANWARE_USER)@git.jannet.de/srv/git/$(JANWARE_USER)/contrib/$(PROJECT_DIRNAME) git config branch.master.remote origin git config branch.master.merge refs/heads/master - #git push + git push origin master @echo "FIXME: after this procedure I had to manually change the remote in the toplevel project's directory .gitmodules to point to the janware server" @echo "FIXME: - push contents there." @exit 1