make remove-dashes: apply to scripts and programs as well, not just to builtins
All programs and scripts are now moved outside PATH, so it's a good idea not to use the dashed forms for them, either. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
6c98c0548a
commit
b4f02d3509
2
Makefile
2
Makefile
@ -1296,7 +1296,7 @@ check: common-cmds.h
|
||||
for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done
|
||||
|
||||
remove-dashes:
|
||||
./fixup-builtins $(BUILT_INS)
|
||||
./fixup-builtins $(BUILT_INS) $(PROGRAMS) $(SCRIPTS)
|
||||
|
||||
### Installation rules
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user