remove references to (unused) pre-{merge,build} directories

diff --git a/do_merge b/do_merge
index 35f3f57fc80e876e572af4dbef9e63276ad18150..0d1cc1b1f62bc24d7843ef928175947dbfd2dd2f 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -108,9 +108,6 @@ for h in $heads; do
        hlog=$(git log -1 --oneline ${h/\/*://}) 2>/dev/null
        log Merging $h "($hlog)"
        old_head=$(git rev-parse HEAD)
-       [ -x "../pre-merge/$tree" ] && {
-               "../pre-merge/$tree" || bash -i || exit
-       }
        case "$h" in
        *:*)
                do_rebase $h $tree
@@ -138,9 +135,6 @@ for h in $heads; do
        tab="\t"
        [ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
        printf "%s$tab%s\n" $tree $(git show-ref --hash "${h/\/*://}") >> $SHA1_FILE
-       [ -x "../pre-build/$tree" ] && {
-               "../pre-build/$tree" || bash -i || exit
-       }
        $no_build && continue
        $need_build || {
                # See if we need to build after merging this tree

diff --git a/merge_akpm b/merge_akpm
index dc8a88c232532ed717cb9cd7704174fcc71e600e..c1bb89d9544ceecb56b1d84b109c9a6af0172233 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -51,9 +51,6 @@ printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $S
                }
        done
 }
-[ -x "../pre-build/akpm-current" ] && {
-       "../pre-build/akpm-current" || bash -i || exit
-}
 
 new_head=$(git rev-parse HEAD)
 
@@ -112,9 +109,6 @@ printf "%s\t\t%s\n" akpm $(git show-ref --hash akpm/master) >> $SHA1_FILE
                }
        done
 }
-[ -x "../pre-build/akpm" ] && {
-       "../pre-build/akpm" || bash -i || exit
-}
 
 new_head=$(git rev-parse HEAD)