From 83944898be684ba4ac0ac3107339110b16f156eb Mon Sep 17 00:00:00 2001
From: Christian Boltz <cboltz@opensuse.org>
Date: Apr 18 2020 19:48:53 +0000
Subject: static/master: include branch name in state name


This is needed to avoid name conflicts when hosting multiple branches of
the same repo, as we do (since the previous commit) with the chameleon
repo.

---

diff --git a/salt/profile/static/master.sls b/salt/profile/static/master.sls
index 013ffed..d1b8acb 100644
--- a/salt/profile/static/master.sls
+++ b/salt/profile/static/master.sls
@@ -48,7 +48,7 @@ static_master_cron_mailto:
 
 # clone git repos
 {% for dir, data in git_repos.items() %}
-{{ data.repo }}:
+{{ data.repo }}-{{ data.get('branch', 'master') }}:
   # salt 2018.3.3 introduced git.cloned - switch once our salt is new enough
   git.latest:
     - branch: {{ data.get('branch', 'master') }}