From d0cf1686b2e0bba5748dec066ebd0b5d1148cc72 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Tue, 24 Jul 2012 11:38:23 +0300
Subject: [PATCH] Add script for automatically checking for unmerged commits

---
 scripts/merge-check.sh | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100755 scripts/merge-check.sh

diff --git a/scripts/merge-check.sh b/scripts/merge-check.sh
new file mode 100755
index 0000000000..0debea8b40
--- /dev/null
+++ b/scripts/merge-check.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+SINCE=$1
+UNTIL=$2
+
+if [ "$SINCE" = "" ] || [ "$UNTIL" = "" ]
+then
+	echo "Usage: $0 <since> <until>"
+	exit 3
+fi
+
+command="git --no-pager log --no-color $SINCE..$UNTIL"
+# TODO Why do I get whitespace in the beginning of the wc output?
+change_count=`$command --oneline|wc -l|tr -d ' '`
+
+if [ "$change_count" = "0" ]
+then
+	echo "No unmerged commits"
+	exit 0
+fi
+
+echo "There are $change_count commits that have not been merged from $UNTIL to $SINCE: "
+echo ""
+$command
+exit 1
\ No newline at end of file
-- 
2.39.5