i18n: rebase-interactive: mark strings for translation

diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index d61f9baceb1bad4e70d8871ce491161e974c1c3c..86b2ff1e07614846465109dcb4b9afed11013839 100755 (executable)
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -361,7 +361,7 @@ while read commit parents; do
                        die "tree filter failed: $filter_tree"
 
                (
-                       git diff-index -r --name-only --ignore-submodules $commit &&
+                       git diff-index -r --name-only --ignore-submodules $commit -- &&
                        git ls-files --others
                ) > "$tempdir"/tree-state || exit
                git update-index --add --replace --remove --stdin \
@@ -404,7 +404,7 @@ while read commit parents; do
        then
                tree=$(git write-tree)
        else
-               tree="$commit^{tree}"
+               tree=$(git rev-parse "$commit^{tree}")
        fi
        workdir=$workdir @SHELL_PATH@ -c "$filter_commit" "git commit-tree" \
                "$tree" $parentstr < ../message > ../map/$commit ||