From 11fd3e4f1b48547cd59d893acc1137927ff120f8 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Mon, 14 May 2012 18:08:19 +0200 Subject: [PATCH] ignore some branches --- misc/tools/conflict-watch.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/misc/tools/conflict-watch.sh b/misc/tools/conflict-watch.sh index 63f67c54..966fef45 100755 --- a/misc/tools/conflict-watch.sh +++ b/misc/tools/conflict-watch.sh @@ -139,6 +139,14 @@ case "$action" in branches ) | while read -r HASH TYPE REFNAME; do echo >&2 -n "$repo $REFNAME..." + case "$repo:$REFNAME" in + xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant) continue ;; + xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-original) continue ;; + xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit) continue ;; + xonotic/netradiant.git:refs/remotes/origin/divVerent/zeroradiant-split-up-the-q3map2-commit-goal) continue ;; + xonotic/fteqcc.git:refs/remotes/origin/wip) continue ;; + xonotic/darkplaces:refs/remotes/origin/master) continue ;; + esac out=$( ( if [ -n "$repodir" ]; then -- 2.39.2