From 81fce02b9810f110183ca2a43ba8a3060cf933f7 Mon Sep 17 00:00:00 2001 From: Leigh B Stoller <stoller@flux.utah.edu> Date: Wed, 27 Jan 2016 16:32:14 -0700 Subject: [PATCH] Rob prefers "current" instead of mothership for the branch name. --- GNUmakefile.in | 2 +- GNUmakerules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 56c333ad30..de711a313c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -436,7 +436,7 @@ BRANCHECHO= @echo "Skipping branch check since not the Mothership" ifeq ($(ISMAINSITE),1) ifeq ($(TBROOT),/usr/testbed) BRANCHCHECK= cd $(SRCDIR) && \ - git status --porcelain -s -b | head -1 | grep -q -s mothership + git status --porcelain -s -b | head -1 | grep -q -s current BRANCHECHO= @echo "Checking to make sure you are on the mothership branch" endif endif diff --git a/GNUmakerules b/GNUmakerules index a04c7ede16..d4b9d73439 100644 --- a/GNUmakerules +++ b/GNUmakerules @@ -113,7 +113,7 @@ default-install: ifeq ($(ISMAINSITE),1) ifeq ($(TBROOT),/usr/testbed/devel/stoller) (cd $(SRCDIR) ; \ - git status --porcelain -s -b | head -1 | grep -q -s mothership) + git status --porcelain -s -b | head -1 | grep -q -s current) else /usr/bin/true endif -- GitLab