Merge branch 'mv/dashless'

* mv/dashless:
make remove-dashes: apply to scripts and programs as well, not just to builtins
git-bisect: use dash-less form on git bisect log
t1007-hash-object.sh: use quotes for the test description
t0001-init.sh: change confusing directory name

diff --git a/Makefile b/Makefile
index 9b52071b7304b5b3b2f88802210f7ed13274c0bd..75c4ead47a61a9ec0cf62a2f6e390dec0983385f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1298,7 +1298,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
 

diff --git a/fixup-builtins b/fixup-builtins
index 49e861d2acb7fce8fde14f304d9cd9d2025656f6..63dfa4c475ae3632fc5cfd093d949a41683a5458 100755 (executable)
--- 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

diff --git a/git-bisect.sh b/git-bisect.sh
index 991b2ef37e5121d89f40d1b10964bf5d5beed40b..3cac20db79e1e408a321b0e9d272501985a3c49b 100755 (executable)
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -149,7 +149,7 @@ bisect_start() {
        echo "$start_head" >"$GIT_DIR/BISECT_START" &&
        sq "$@" >"$GIT_DIR/BISECT_NAMES" &&
        eval "$eval" &&
-       echo "git-bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
+       echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
        #
        # Check if we can proceed to the next bisect state.
        #
@@ -169,7 +169,7 @@ bisect_write() {
        esac
        git update-ref "refs/bisect/$tag" "$rev" || exit
        echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG"
-       test -n "$nolog" || echo "git-bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
+       test -n "$nolog" || echo "git bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
 }
 
 bisect_state() {
@@ -426,9 +426,13 @@ bisect_clean_state() {
 bisect_replay () {
        test -r "$1" || die "cannot read $1 for replaying"
        bisect_reset
-       while read bisect command rev
+       while read git bisect command rev
        do
-               test "$bisect" = "git-bisect" || continue
+               test "$git $bisect" = "git bisect" -o "$git" = "git-bisect" || continue
+               if test "$git" = "git-bisect"; then
+                       rev="$command"
+                       command="$bisect"
+               fi
                case "$command" in
                start)
                        cmd="bisect_start $rev"

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index d31887f9bf35a7fa9e31b1eb859a9cf21c918d6c..2a38d98cb46ec5392093dc3c0eedf28d6f56c96b 100755 (executable)
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -83,11 +83,11 @@ test_expect_success 'init --bare' '
 
        (
                unset GIT_DIR GIT_WORK_TREE GIT_CONFIG
-               mkdir git-init-bare.git &&
-               cd git-init-bare.git &&
+               mkdir init-bare.git &&
+               cd init-bare.git &&
                git init --bare
        ) &&
-       check_config git-init-bare.git true unset
+       check_config init-bare.git true unset
 '
 
 test_expect_success 'GIT_DIR non-bare' '

diff --git a/t/t1007-hash-object.sh b/t/t1007-hash-object.sh
index 05262954abbd5aa054fbde44f946d58e07a54574..1ec0535138c72bbd1e497c35c21bc5ea46b0315f 100755 (executable)
--- a/t/t1007-hash-object.sh
+++ b/t/t1007-hash-object.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description=git-hash-object
+test_description="git-hash-object"
 
 . ./test-lib.sh