From b48730137d9b630362edbce822ea42f8c4fa5bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= Date: Tue, 6 Nov 2018 17:10:08 +0100 Subject: [PATCH] Remove makefiles from auto push/pull --- .makefiles/git.mk | 5 +---- .makefiles/makefiles.mk | 7 ++----- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.makefiles/git.mk b/.makefiles/git.mk index ac5eaad..6a8b63c 100644 --- a/.makefiles/git.mk +++ b/.makefiles/git.mk @@ -22,7 +22,4 @@ else rm $(KEY_FILE) endif -push:: git-push -pull:: git-pull - -.PHONY:: commit tag push git-push git-pull push-github +.PHONY:: commit tag git-push git-pull push-github diff --git a/.makefiles/makefiles.mk b/.makefiles/makefiles.mk index 504e139..60ae8bb 100644 --- a/.makefiles/makefiles.mk +++ b/.makefiles/makefiles.mk @@ -1,5 +1,5 @@ makefiles-remote: - @git remote add makefiles ssh://git@lab.cluster.gsi.dit.upm.es:2200/docs/templates/makefiles.git 2>/dev/null || true + git ls-remote --exit-code makefiles 2> /dev/null || git remote add makefiles ssh://git@lab.cluster.gsi.dit.upm.es:2200/docs/templates/makefiles.git makefiles-commit: makefiles-remote git add -f .makefiles @@ -12,7 +12,4 @@ makefiles-push: makefiles-pull: makefiles-remote git subtree pull --prefix=.makefiles/ makefiles master --squash -pull:: makefiles-pull -push:: makefiles-push - -.PHONY:: makefiles-remote makefiles-commit makefiles-push makefiles-pull pull push +.PHONY:: makefiles-remote makefiles-commit makefiles-push makefiles-pull