move mmotm to here as well

[next-scripts] / import-akpm

diff --git a/import-akpm b/import-akpm
index 7f2c0cf3a7a8cc6c08a18c2fe05b018b90439225..7416311d7449ff9aef4b54fc65baa295055775c9 100755 (executable)
--- a/import-akpm
+++ b/import-akpm
@@ -14,14 +14,17 @@ execute()
        [ ${PIPESTATUS[0]} -eq 0 ] || $SHELL -i || exit 1
 }
 
-mmotm="../../mmotm/text"
+mmotm="../mmotm"
 sfile="$mmotm/series"
 cpwd=$(pwd)
 
 [ -f "$mmotm/broken-out/origin.patch" ] &&
        base=$(sed -n '1s/^GIT *\([^ ]*\).*$/\1/p' "$mmotm/broken-out/origin.patch")
-[ "$base" ] ||
-       base=$(git describe --abbrev=0 origin/master)
+[ "$base" ] || {
+       base=$(tail -n 1 "$mmotm/.DATE")
+       base=${base#v}
+       base="v${base}"
+}
 nbase=$(sed -n '1s/^GIT *\([^ ]*\).*$/\1/p' "$mmotm/broken-out/linux-next.patch")
 git rev-parse --verify "$base" >/dev/null || {
        log "Unknown origin BASE $base"