X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=import-akpm;h=ac5750446e3821314eab48108da740bab2c86709;hb=0fb8e60326c67bbfd0dd0dd8c15f99b812128ed3;hp=6f5c080bdc5a9a0f464645c54cd72c5eb6ddae9a;hpb=1e782e8967ca661a109662f070538fc56e18ae77;p=next-scripts

diff --git a/import-akpm b/import-akpm
index 6f5c080..ac57504 100755
--- a/import-akpm
+++ b/import-akpm
@@ -1,17 +1,20 @@
 #!/bin/bash
 
-log_file=../akpm-import.log
+export LOG_FILE=../akpm-import.log
+
+# shellcheck source=./common.sh
+. "$(dirname "$0")/common.sh" ''
 
 log()
 {
-	echo "$@" | tee -a $log_file
+	echo "$@" | tee -a $LOG_FILE
 }
 
 execute()
 {
-	log "$" $@
-	"$@" 2>&1 | tee -a $log_file
-	[ ${PIPESTATUS[0]} -eq 0 ] || $SHELL -i || exit 1
+	log '$' "$@"
+	"$@" 2>&1 | tee -a $LOG_FILE
+	return ${PIPESTATUS[0]}
 }
 
 mmotm="../mmotm"
@@ -43,11 +46,13 @@ log "Importing akpm based on $db/$dnb"
 	exit 1
 }
 
-execute git worktree add -b tmp-akpm/master ../tmp-akpm "$db"
+execute git worktree add -b tmp-akpm/master ../tmp-akpm "$db" ||
+	$SHELL -i || exit
 
 log '$' cd ../tmp-akpm
 cd ../tmp-akpm
-execute git branch tmp-akpm/current-base
+execute git branch tmp-akpm/current-base ||
+	$SHELL -i || exit
 
 sed_exp='
 /NEXT_PATCHES_START/,/NEXT_PATCHES_END/{
@@ -62,12 +67,28 @@ for f in $patches; do
 	origin.patch)
 		;;
 	linux-next.patch)
-		execute git branch tmp-akpm/current
-		execute git merge --no-edit --no-stat "$dnb"
-		execute git branch tmp-akpm/master-base
+		execute git branch tmp-akpm/current ||
+			$SHELL -i || exit
+		execute git merge --no-edit --no-stat "$dnb" || {
+			check_unmerged_files akpm-current
+
+			git diff 2>&1 | grep -E -q '<<<<<|^\*' && {
+				$SHELL -i || exit
+			}
+			GIT_EDITOR=: execute git commit -v -a
+		}
+		[ -f "../merge-fixes/akpm-current" ] && {
+			for p in $(cat "../merge-fixes/akpm-current"); do
+				$(dirname $0)/merge_fix -n "$p" ||
+					$SHELL -i || exit
+			done
+		}
+		execute git branch tmp-akpm/master-base ||
+			$SHELL -i || exit
 		;;
 	*)
-		execute git am -s --patch-format=mbox "$mmotm/broken-out/$f"
+		execute git am -s --patch-format=mbox "$mmotm/broken-out/$f" ||
+			$SHELL -i || exit
 		;;
 	esac
 done