Fix read-tree merging more than 3 trees using 3-way merge

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 0ff3475525a0d50739f218abbac91eb2dc926430..c42e4512cfb529223f196abd546a988b9809b0ef 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -170,13 +170,6 @@ do
        esac
 done < "$tempdir"/backup-refs
 
-case "$GIT_DIR" in
-/*)
-       ;;
-*)
-       GIT_DIR="$(pwd)/../../$GIT_DIR"
-       ;;
-esac
 export GIT_DIR GIT_WORK_TREE=.
 
 # These refs should be updated if their heads were rewritten
@@ -298,7 +291,7 @@ do
        # Assign the boundarie(s) in the set of rewritten commits
        # as the replacement commit(s).
        # (This would look a bit nicer if --not --stdin worked.)
-       for p in $((cd "$workdir"/../map; ls | sed "s/^/^/") |
+       for p in $( (cd "$workdir"/../map; ls | sed "s/^/^/") |
                git rev-list $ref --boundary --stdin |
                sed -n "s/^-//p")
        do