janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-21 21:57:38 +01:00
Code Activity

git-submod.mk: Some improvements

Browse source 
Signed-off-by: Jan Lindemann <jan@janware.com>
This commit is contained in:
Jan Lindemann 2016-12-18 12:50:49 +00:00
commit f2cc170cf5
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
make/git-submod.mk
View file

@ -1,3 +1,5 @@
GIT_SRV_ADMIN_SH = ssh $(JANWARE_USER)@git.jannet.de /opt/ytools/bin/git-srv-admin.sh
all: all:
install: install:
clean: 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: Then this target in $(lastword $(MAKEFILE_LIST)) has to do the following:"
@echo "FIXME: - Use that," @echo "FIXME: - Use that,"
@echo "FIXME: - rename remote \"origin\" to \"upstream\", # git remote rename origin upstream" @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/<project>" @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/<project>"
@echo "FIXME: - fix remote to push to # git config branch.master.remote origin" @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 "FISME: - set standard branch (should be okay anyway) # git config branch.master.merge refs/heads/master"
@echo "FIXME: - push contents there." @echo "FIXME: - push contents there."
@exit 1 @exit 1
git-submod-test-init-remote: git-submod-test-init-remote:
$(GIT_SRV_ADMIN_SH) -F contrib create-repo $(PROJECT_DIRNAME)
git remote rename origin upstream 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.remote origin
git config branch.master.merge refs/heads/master 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: 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." @echo "FIXME: - push contents there."
@exit 1 @exit 1