summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alex@spline.inf.fu-berlin.de>2016-08-13 04:20:20 +0200
committerAlexander Sulfrian <alex@spline.inf.fu-berlin.de>2016-08-13 04:20:20 +0200
commitc964a0f62af7ac8a92dcfaa7e3a247cc24b8aae3 (patch)
tree9fc86408bbda026d72d3016ed1505cefd538a7c1
parentc23e8e4cc0ae49f1a5cea41490c89fa4a89e4710 (diff)
downloadbcfg2-tools-c964a0f62af7ac8a92dcfaa7e3a247cc24b8aae3.tar.gz
bcfg2-tools-c964a0f62af7ac8a92dcfaa7e3a247cc24b8aae3.tar.bz2
bcfg2-tools-c964a0f62af7ac8a92dcfaa7e3a247cc24b8aae3.zip
renew-config: Compare branches with symetric difference
-rwxr-xr-xrenew-config2
1 files changed, 1 insertions, 1 deletions
diff --git a/renew-config b/renew-config
index 874b3b3..5ed1b2d 100755
--- a/renew-config
+++ b/renew-config
@@ -9,7 +9,7 @@ git push origin master 2>/dev/null
# check if remote is up to date
git fetch git@git.spline.de:server/bcfg2-repository 2>/dev/null
-if [ -n "$(git rev-list HEAD..FETCH_HEAD)" ]; then
+if [ -n "$(git rev-list HEAD...FETCH_HEAD)" ]; then
error "$REPO: HEAD does not equal to origin/master."
fi