summaryrefslogtreecommitdiffstats
path: root/scripts/merge-check.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/merge-check.sh')
-rwxr-xr-xscripts/merge-check.sh24
1 files changed, 24 insertions, 0 deletions
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