kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2008-07-16 17:49:59 -07:00
parent 0513f241cc b4f02d3509
commit 1f8dc67155
5 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1298,7 +1298,7 @@ check: common-cmds.h
for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done for i in *.c; do sparse $(ALL_CFLAGS) $(SPARSE_FLAGS) $$i || exit; done


remove-dashes: remove-dashes:
./fixup-builtins $(BUILT_INS) ./fixup-builtins $(BUILT_INS) $(PROGRAMS) $(SCRIPTS)


### Installation rules ### Installation rules



18
fixup-builtins
View File

@ -1,16 +1,16 @@
#!/bin/sh #!/bin/sh
while [ "$1" ] while [ "$1" ]
do do
old="$1" if [ "$1" != "git-sh-setup" -a "$1" != "git-parse-remote" -a "$1" != "git-svn" ]; then
new=$(echo "$1" | sed 's/git-/git /') old="$1"
echo "Converting '$old' to '$new'" new=$(echo "$1" | sed 's/git-/git /')
git ls-files '*.sh' | while read file echo "Converting '$old' to '$new'"
do sed -i "s/\\<$old\\>/$new/g" $(git ls-files '*.sh')
sed "s/\\<$old\\>/$new/g" < $file > $file.new fi
chmod --reference=$file $file.new
mv $file.new $file
done
shift shift
done 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 git update-index --refresh >& /dev/null
exit 0 exit 0

12
git-bisect.sh
View File

@ -149,7 +149,7 @@ bisect_start() {
echo "$start_head" >"$GIT_DIR/BISECT_START" && echo "$start_head" >"$GIT_DIR/BISECT_START" &&
sq "$@" >"$GIT_DIR/BISECT_NAMES" && sq "$@" >"$GIT_DIR/BISECT_NAMES" &&
eval "$eval" && 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. # Check if we can proceed to the next bisect state.
# #
@ -169,7 +169,7 @@ bisect_write() {
esac esac
git update-ref "refs/bisect/$tag" "$rev" || exit git update-ref "refs/bisect/$tag" "$rev" || exit
echo "# $state: $(git show-branch $rev)" >>"$GIT_DIR/BISECT_LOG" 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() { bisect_state() {
@ -426,9 +426,13 @@ bisect_clean_state() {
bisect_replay () { bisect_replay () {
test -r "$1" || die "cannot read $1 for replaying" test -r "$1" || die "cannot read $1 for replaying"
bisect_reset bisect_reset
while read bisect command rev while read git bisect command rev
do 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 case "$command" in
start) start)
cmd="bisect_start $rev" cmd="bisect_start $rev"

6
t/t0001-init.sh
View File

@ -83,11 +83,11 @@ test_expect_success 'init --bare' '


( (
unset GIT_DIR GIT_WORK_TREE GIT_CONFIG unset GIT_DIR GIT_WORK_TREE GIT_CONFIG
mkdir git-init-bare.git && mkdir init-bare.git &&
cd git-init-bare.git && cd init-bare.git &&
git init --bare 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' ' test_expect_success 'GIT_DIR non-bare' '

2
t/t1007-hash-object.sh
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh


test_description=git-hash-object test_description="git-hash-object"


. ./test-lib.sh . ./test-lib.sh