use -b (branch) instead of -t (tree)

[next-scripts] / import-akpm

diff --git a/import-akpm b/import-akpm
index 6f5c080bdc5a9a0f464645c54cd72c5eb6ddae9a..235ab70386eb5eeb90b2e71226e10f708f5b0c63 100755 (executable)
--- 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,13 +46,16 @@ 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='
+s/\r$//
 /NEXT_PATCHES_START/,/NEXT_PATCHES_END/{
        s/[ \t]*#.*$//
        /^[ \t]*$/!p
@@ -62,12 +68,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