5 echo "$@" | tee -a ../akpm-import.log
11 "$@" 2>&1 | tee -a ../akpm-import.log
12 [ ${PIPESTATUS[0]} -eq 0 ] || sh -i || {
13 [ -f "$sfile.orig" ] &&
14 mv -f "$sfile.orig" "$sfile"
20 mmotm="../../mmotm/text"
24 base=$(sed -n '1s/^GIT *\([^ ]*\).*$/\1/p' "$mmotm/broken-out/origin.patch")
25 nbase=$(sed -n '1s/^GIT *\([^ ]*\).*$/\1/p' "$mmotm/broken-out/linux-next.patch")
26 log "Importing $name based on $base/$nbase"
27 git rev-parse --verify "$base" >/dev/null || {
28 log "Unknown origin BASE"
31 git rev-parse --verify "$nbase" >/dev/null || {
32 log "Unknown linux-next BASE"
36 mv -f "$sfile" "$sfile.orig"
38 grep -q NEXT_PATCHES "$sfile.orig" && do_echo=:
41 *NEXT_PATCHES_START*) do_echo=echo
43 *NEXT_PATCHES_END*) do_echo=:
48 sed -e 's/[ ]*#.*$//' -e '/^[ ]*$/d' >"$sfile"
50 git show-ref --quiet --verify "refs/heads/quilt/$name" ||
51 execute git branch "quilt/$name" "$base"
54 log " quilt series is empty"
55 mv -f "$sfile.orig" "$sfile"
56 execute git update-ref "refs/heads/quilt/$name" "$nbase"
60 [ -d "../quilt-tmp" ] ||
61 execute git clone -s -l -n -q . ../quilt-tmp
63 log '$' cd ../quilt-tmp
65 execute git reset --hard "$base"
66 GIT_EDITOR=: execute git merge "$nbase" || bash -i || exit 1
69 for f in $(cat "$mmotm/series"); do
70 [ "$f" = "origin.patch" ] && continue
71 [ "$f" = "linux-next.patch" ] && continue
72 execute git am "$mmotm/broken-out/$f" ||
80 execute git fetch -f ../quilt-tmp master:"quilt/$name"
81 execute git fetch -f ../quilt-tmp base:"quilt/${name}-base"
83 mv -f "$sfile.orig" "$sfile"
85 [ -d "../quilt-tmp" ] &&