Use cd_to_toplevel in scripts that implement it by hand.

This converts scripts that do "cd $(rev-parse --show-cdup)" by
hand to use cd_to_toplevel.

I think git-fetch does not have to go to the toplevel, but that
should be dealt with in a separate patch.

Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2007-01-12 12:49:05 -08:00
Родитель 9fde9401a9
Коммит 514c09fdcf
4 изменённых файлов: 11 добавлений и 29 удалений

Просмотреть файл

@ -135,11 +135,7 @@ fi
# We are switching branches and checking out trees, so # We are switching branches and checking out trees, so
# we *NEED* to be at the toplevel. # we *NEED* to be at the toplevel.
cdup=$(git-rev-parse --show-cdup) cd_to_toplevel
if test ! -z "$cdup"
then
cd "$cdup"
fi
[ -z "$new" ] && new=$old && new_name="$old_name" [ -z "$new" ] && new=$old && new_name="$old_name"

Просмотреть файл

@ -316,22 +316,16 @@ esac
################################################################ ################################################################
# Prepare index to have a tree to be committed # Prepare index to have a tree to be committed
TOP=`git-rev-parse --show-cdup`
if test -z "$TOP"
then
TOP=./
fi
case "$all,$also" in case "$all,$also" in
t,) t,)
save_index && save_index &&
( (
cd "$TOP" cd_to_toplevel &&
GIT_INDEX_FILE="$NEXT_INDEX" GIT_INDEX_FILE="$NEXT_INDEX" &&
export GIT_INDEX_FILE export GIT_INDEX_FILE &&
git-diff-files --name-only -z | git-diff-files --name-only -z |
git-update-index --remove -z --stdin git-update-index --remove -z --stdin
) ) || exit
;; ;;
,t) ,t)
save_index && save_index &&
@ -339,11 +333,11 @@ t,)
git-diff-files --name-only -z -- "$@" | git-diff-files --name-only -z -- "$@" |
( (
cd "$TOP" cd_to_toplevel &&
GIT_INDEX_FILE="$NEXT_INDEX" GIT_INDEX_FILE="$NEXT_INDEX" &&
export GIT_INDEX_FILE export GIT_INDEX_FILE &&
git-update-index --remove -z --stdin git-update-index --remove -z --stdin
) ) || exit
;; ;;
,) ,)
case "$#" in case "$#" in

Просмотреть файл

@ -5,12 +5,8 @@ USAGE='<fetch-options> <repository> <refspec>...'
SUBDIRECTORY_OK=Yes SUBDIRECTORY_OK=Yes
. git-sh-setup . git-sh-setup
set_reflog_action "fetch $*" set_reflog_action "fetch $*"
cd_to_toplevel ;# probably unnecessary...
TOP=$(git-rev-parse --show-cdup)
if test ! -z "$TOP"
then
cd "$TOP"
fi
. git-parse-remote . git-parse-remote
_x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]' _x40='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
_x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40" _x40="$_x40$_x40$_x40$_x40$_x40$_x40$_x40$_x40"

Просмотреть файл

@ -53,11 +53,7 @@ then
exit exit
fi fi
TOP=$(git-rev-parse --show-cdup) cd_to_toplevel
if test ! -z "$TOP"
then
cd "$TOP"
fi
if test "$reset_type" = "--hard" if test "$reset_type" = "--hard"
then then