3 log_file=../akpm-import.log
7 echo "$@" | tee -a $log_file
13 "$@" 2>&1 | tee -a $log_file
14 [ ${PIPESTATUS[0]} -eq 0 ] || $SHELL -i || exit 1
18 mmotm="../../mmotm/text"
22 base=$(sed -n '1s/^GIT *\([^ ]*\).*$/\1/p' "$mmotm/broken-out/origin.patch")
23 nbase=$(sed -n '1s/^GIT *\([^ ]*\).*$/\1/p' "$mmotm/broken-out/linux-next.patch")
24 log "Importing $name based on $base/$nbase"
25 git rev-parse --verify "$base" >/dev/null || {
26 log "Unknown origin BASE"
29 git rev-parse --verify "$nbase" >/dev/null || {
30 log "Unknown linux-next BASE"
34 [ -d "../quilt-tmp" ] ||
35 execute git clone -s -l -n -q . ../quilt-tmp
37 log '$' cd ../quilt-tmp
39 execute git reset --hard "$base"
40 git branch current-base
42 sed_exp='/NEXT_PATCHES_START/,/NEXT_PATCHES_END/{s/[ \t]*#.*$//;/^[ \t]*$/!p;};/^linux-next.patch/p'
43 patches=$(sed -n "$sed_exp" "$sfile")
46 [ "$f" = "origin.patch" ] && continue
47 [ "$f" = "linux-next.patch" ] && {
49 execute git merge --no-edit --no-stat "$nbase"
50 git branch master-base
53 execute git am --patch-format=mbox "$mmotm/broken-out/$f"
59 execute git fetch -f ../quilt-tmp current:"$name/current"
60 execute git fetch -f ../quilt-tmp current-base:"$name/current-base"
61 execute git fetch -f ../quilt-tmp master:"$name/master"
62 execute git fetch -f ../quilt-tmp master-base:"$name/master-base"