diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-05 01:16:27 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-05 01:16:27 -0700 |
| commit | f8abaebab3fe1a1b873f9636ea410ac4007c8fa8 (patch) | |
| tree | 0501ad7e7fc1a0641d73dc7f554238b0f73484a9 | |
| parent | 04f2ddda8426d3ae46d52d9dcbfc00bd3c52e645 (diff) | |
| parent | 531c8dd4fb18e653d6170d367e4b23c3164d5ce0 (diff) | |
| download | git-f8abaebab3fe1a1b873f9636ea410ac4007c8fa8.tar.gz | |
Merge branch 'maint'
* maint:
fixup-builtins: retire an old transition helper script
| -rw-r--r-- | Makefile | 3 | ||||
| -rwxr-xr-x | fixup-builtins | 16 |
2 files changed, 0 insertions, 19 deletions
@@ -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))),) diff --git a/fixup-builtins b/fixup-builtins deleted file mode 100755 index 63dfa4c475..0000000000 --- a/fixup-builtins +++ /dev/null @@ -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 |