Start deprecating "git-command" in favor of "git command"

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 8fa5ce6467b12119868a4c3c74c3e3740f6d6b8e..e9907598e52901d698cfa339cde3e28f18cb6846 100644 (file)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -312,9 +312,10 @@ case "$GIT_DIR" in
 /*)
        ;;
 *)
-       export GIT_DIR="$(pwd)/../../$GIT_DIR"
+       GIT_DIR="$(pwd)/../../$GIT_DIR"
        ;;
 esac
+export GIT_DIR GIT_WORK_TREE=.
 
 export GIT_INDEX_FILE="$(pwd)/../index"
 git-read-tree # seed the index file
@@ -383,7 +384,7 @@ while read commit parents; do
 
        sed -e '1,/^$/d' <../commit | \
                eval "$filter_msg" | \
-               sh -c "$filter_commit" git-commit-tree $(git-write-tree) $parentstr | \
+               sh -c "$filter_commit" "git-commit-tree" $(git-write-tree) $parentstr | \
                tee ../map/$commit
 done <../revs