i18n: add no-op _() and N_() wrappers

[thirdparty/git.git] / fixup-builtins

diff --git a/fixup-builtins b/fixup-builtins
index 49e861d2acb7fce8fde14f304d9cd9d2025656f6..63dfa4c475ae3632fc5cfd093d949a41683a5458 100755 (executable)
--- a/fixup-builtins
+++ b/fixup-builtins
@@ -1,16 +1,16 @@
 #!/bin/sh
 while [ "$1" ]
 do
-       old="$1"
-       new=$(echo "$1" | sed 's/git-/git /')
-       echo "Converting '$old' to '$new'"
-       git ls-files '*.sh' | while read file
-       do
-               sed "s/\\<$old\\>/$new/g" < $file > $file.new
-               chmod --reference=$file $file.new
-               mv $file.new $file
-       done
+       if [ "$1" != "git-sh-setup" -a "$1" != "git-parse-remote" -a "$1" != "git-svn" ]; then
+               old="$1"
+               new=$(echo "$1" | sed 's/git-/git /')
+               echo "Converting '$old' to '$new'"
+               sed -i "s/\\<$old\\>/$new/g" $(git ls-files '*.sh')
+       fi
        shift
 done
+
+sed -i 's/git merge-one-file/git-merge-one-file/g
+s/git rebase-todo/git-rebase-todo/g' $(git ls-files '*.sh')
 git update-index --refresh >& /dev/null
 exit 0