Merge branch 'maint'

* maint:
  fixup-builtins: retire an old transition helper script
This commit is contained in:
Junio C Hamano 2013-07-05 01:16:27 -07:00
commit f8abaebab3
2 changed files with 0 additions and 19 deletions

View file

@ -2305,9 +2305,6 @@ check: common-cmds.h
exit 1; \
fi
remove-dashes:
./fixup-builtins $(BUILT_INS) $(PROGRAMS) $(SCRIPTS)
### Installation rules
ifneq ($(filter /%,$(firstword $(template_dir))),)

View file

@ -1,16 +0,0 @@
#!/bin/sh
while [ "$1" ]
do
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