summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2015-02-24 20:40:02 +0000
committerTails developers <amnesia@boum.org>2015-02-24 20:47:10 +0000
commite28678d6bc5be081daec6e8a62d119436af8ca8f (patch)
tree2af28e1f03cce83bc04cba3212371c96beb9ecb0 /bin
parente7427ade72e1ea7b45fa6dd95d18187773ded8b2 (diff)
Make development easier by allowing to run the script from its own branch.
Diffstat (limited to 'bin')
-rwxr-xr-xbin/git-delete-branches5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/git-delete-branches b/bin/git-delete-branches
index 88327e8..1eea6bd 100755
--- a/bin/git-delete-branches
+++ b/bin/git-delete-branches
@@ -11,7 +11,7 @@ REMOVE_FROM_REMOTE=1
MANAGED_REMOTE="origin"
# These branches will never be removed
-BRANCHES_TO_KEEP="master head devel experimental testing"
+BRANCHES_TO_KEEP="master head devel experimental testing feature/8617-delete-obsolete-Git-branches"
######################################################
# Nothing below this point should need to be edited #
@@ -28,7 +28,8 @@ if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
fi
CURRENT=$(git rev-parse --abbrev-ref HEAD)
-if [ "$CURRENT" != 'master' ]; then
+if [ "$CURRENT" != 'master' ] && \
+ [ "$CURRENT" != 'feature/8617-delete-obsolete-Git-branches' ] ; then
echo "Switch to the master branch before running this script." >&2
exit 1
fi