summaryrefslogtreecommitdiffstats
path: root/git
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-13 13:45:16 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-12-13 13:45:25 +0000
commite5f2697c7126cc65ff494279e616541fe8fda0b4 (patch)
tree3954e74d572b1d2bcc43a1d6f967fb212996af17 /git
parentReleasing debian version 20210928-1. (diff)
downloadopen-infrastructure-service-tools-e5f2697c7126cc65ff494279e616541fe8fda0b4.tar.xz
open-infrastructure-service-tools-e5f2697c7126cc65ff494279e616541fe8fda0b4.zip
Merging upstream version 20211213.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'git')
-rwxr-xr-xgit/bin/git-checkout-branches7
1 files changed, 1 insertions, 6 deletions
diff --git a/git/bin/git-checkout-branches b/git/bin/git-checkout-branches
index f1aa862..e98345d 100755
--- a/git/bin/git-checkout-branches
+++ b/git/bin/git-checkout-branches
@@ -29,16 +29,11 @@ do
BRANCH="$(echo "${REMOTE_BRANCH}" | cut -d/ -f 2-)"
case "${BRANCH}" in
- HEAD)
+ HEAD|${CURRENT_BRANCH})
continue
;;
esac
- if git branch | grep -Eq "^ *${BRANCH}$"
- then
- continue
- fi
-
git checkout -b "${BRANCH}" "${REMOTE_BRANCH}"
done