From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 24 Jul 2015 04:53:26 +0000 (+1000)
Subject: merge_akpm: add removing files logic
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=d270a218b283d15bda88ffdd0ee662f3ab3d689e;p=next-scripts

merge_akpm: add removing files logic
---

diff --git a/merge_akpm b/merge_akpm
index f7670db..6f3f070 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -36,6 +36,12 @@ execute git merge --no-ff akpm-current/current || {
 	echo Merge failed 1>&2
 	echo $h >>../merge.debug
 	git diff >>../merge.debug 2>&1
+	um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
+	[ "$um_files" ] && [ -f "../merge-files/akpm-current" ] && {
+		rm_files=$(grep -F "$um_files" "../merge-files/akpm-current")
+		[ "$rm_files" ] &&
+			"$bin_dir/do_rm" $rm_files
+	}
 	git diff 2>&1 | egrep -q '<<<<<|^\*' && {
 		bash -i || exit
 	}