mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'maint'
* maint: fixup-builtins: retire an old transition helper script
This commit is contained in:
commit
f8abaebab3
3
Makefile
3
Makefile
|
@ -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))),)
|
||||
|
|
|
@ -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
|
Loading…
Reference in a new issue