From 95a7cbb09de1d63ed050371a34794b3fed49b2dc Mon Sep 17 00:00:00 2001
From: Clément Bœsch <u@pkh.me>
Date: Sun, 25 Sep 2016 19:26:39 +0200
Subject: doc: move out merge script to tools

---
 tools/libav-merge-next-commit | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100755 tools/libav-merge-next-commit

(limited to 'tools/libav-merge-next-commit')

diff --git a/tools/libav-merge-next-commit b/tools/libav-merge-next-commit
new file mode 100755
index 0000000000..9bd03fabf8
--- /dev/null
+++ b/tools/libav-merge-next-commit
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if [ "$1" != "merge" -a "$1" != "noop" ]; then
+    printf "Usage: $0 <merge|noop [REF_HASH]>\n"
+    exit 0
+fi
+
+[ "$1" = "noop" ] && merge_opts="-s ours"
+
+nextrev=$(git rev-list libav/master --not master --no-merges | tail -n1)
+if [ -z "$nextrev" ]; then
+    printf "Nothing to merge..\n"
+    exit 0
+fi
+printf "Merging $(git log -n 1 --oneline $nextrev)\n"
+git merge --no-commit $merge_opts --no-ff --log $nextrev
+
+if [ "$1" = "noop" -a -n "$2" ]; then
+    printf "\nThis commit is a noop, see $2\n" >> .git/MERGE_MSG
+fi
+
+printf "\nMerged-by: $(git config --get user.name) <$(git config --get user.email)>\n" >> .git/MERGE_MSG
-- 
cgit v1.2.3