From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 26 May 2014 04:20:41 +0000 (+1000)
Subject: do_merge: allow for pre merge actions
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=e8b703b9198872699a86556d54208c342f151944;p=next-scripts

do_merge: allow for pre merge actions
---

diff --git a/do_merge b/do_merge
index cb110cc..68f7f86 100755
--- a/do_merge
+++ b/do_merge
@@ -106,8 +106,15 @@ for h in $heads; do
 	}
 
 	hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
-	log Merging $h "($hlog)"
 	old_head=$(git rev-parse HEAD)
+	[ -f "../pre-merge/$tree" ] && {
+		for p in $(cat "../pre-merge/$tree"); do
+			"$bin_dir/do_patch" -n "$p" || {
+				bash -i || exit
+			}
+		done
+	}
+	log Merging $h "($hlog)"
 	case "$h" in
 	*:*)
 		do_rebase $h $tree