abstract out check_unmerged files

diff --git a/common.sh b/common.sh
index 9f18277ca57cc1b8d782514d27724bb851f1dfdd..7eaa48620e0214885854a542a612c7e113c5f317 100644 (file)
--- a/common.sh
+++ b/common.sh
@@ -54,4 +54,19 @@ get_contacts()
        awk -F '\t' '/^[^#]/ && $3=="'"$1"'" { print $1; }' $CTRL_FILE
 }
 
+check_unmerged_files()
+{
+       local tree="$1"
+       local um_files
+       local rm_files
+
+       um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
+       if [ "$um_files" ] && [ -f "../merge-files/$tree" ]; then
+               rm_files=$(grep -F "$um_files" "../merge-files/$tree")
+               if [ "$rm_files" ]; then
+                       "$bin_dir/do_rm" $rm_files
+               fi
+       fi
+}
+
 true

diff --git a/do_merge b/do_merge
index eee20322459ff7cd976a2c319089258f7d51dc18..1618be3edeaff5f41e68d78d7882de24476bc811 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -131,12 +131,9 @@ for h in $heads; do
                        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/$tree" ] && {
-                               rm_files=$(grep -F "$um_files" "../merge-files/$tree")
-                               [ "$rm_files" ] &&
-                                       "$bin_dir/do_rm" $rm_files
-                       }
+
+                       check_unmerged_files "$tree"
+
                        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                                linux-next-notify "new conflict found merging $tree"
                                if [ -f "../merge-fixes/$tree" ]; then

diff --git a/import-akpm b/import-akpm
index ef85f1f1ee9c305dba06b3d09bcee52abc9f2ab6..ac5750446e3821314eab48108da740bab2c86709 100755 (executable)
--- a/import-akpm
+++ b/import-akpm
@@ -2,6 +2,9 @@
 
 export LOG_FILE=../akpm-import.log
 
+# shellcheck source=./common.sh
+. "$(dirname "$0")/common.sh" ''
+
 log()
 {
        echo "$@" | tee -a $LOG_FILE
@@ -67,12 +70,8 @@ for f in $patches; do
                execute git branch tmp-akpm/current ||
                        $SHELL -i || exit
                execute git merge --no-edit --no-stat "$dnb" || {
-                       umf=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
-                       [ "$umf" ] && [ -f "../merge-files/akpm-current" ] && {
-                               rmf=$(grep -F "$umf" "../merge-files/akpm-current")
-                               [ "$rmf" ] &&
-                                       "$bin_dir/do_rm" $rmf
-                       }
+                       check_unmerged_files akpm-current
+
                        git diff 2>&1 | grep -E -q '<<<<<|^\*' && {
                                $SHELL -i || exit
                        }

diff --git a/merge_akpm b/merge_akpm
index 0c3684d74887a3e0ceb347faa0963755c3a9f424..4b9be3adcb2aa61b3045e61e81933036daf3a29f 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -36,12 +36,9 @@ 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
-       }
+
+       check_unmerged_files akpm-current
+
        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                bash -i || exit
        }