diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-07-11 02:12:06 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-07-11 21:13:17 -0700 |
| commit | b4f02d3509e8e4da0f115b9515d52daa02621db7 (patch) | |
| tree | b82300b8ec9dce62b7fa94d759cd9591d68e01e7 /fixup-builtins | |
| parent | 6c98c0548aa3433ba64708ca8f08d44cd923f0b7 (diff) | |
| download | git-b4f02d3509e8e4da0f115b9515d52daa02621db7.tar.gz git-b4f02d3509e8e4da0f115b9515d52daa02621db7.tar.xz | |
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>
Diffstat (limited to 'fixup-builtins')
| -rwxr-xr-x | fixup-builtins | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/fixup-builtins b/fixup-builtins index 49e861d2a..63dfa4c47 100755 --- 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 |