Skip to content

Commit

Permalink
Use cd_to_toplevel in scripts that implement it by hand.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Jan 13, 2007
1 parent 9fde940 commit 514c09f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 29 deletions.
6 changes: 1 addition & 5 deletions git-checkout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,7 @@ fi

# We are switching branches and checking out trees, so
# we *NEED* to be at the toplevel.
cdup=$(git-rev-parse --show-cdup)
if test ! -z "$cdup"
then
cd "$cdup"
fi
cd_to_toplevel

[ -z "$new" ] && new=$old && new_name="$old_name"

Expand Down
22 changes: 8 additions & 14 deletions git-commit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -316,34 +316,28 @@ esac
################################################################
# 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
t,)
save_index &&
(
cd "$TOP"
GIT_INDEX_FILE="$NEXT_INDEX"
export GIT_INDEX_FILE
cd_to_toplevel &&
GIT_INDEX_FILE="$NEXT_INDEX" &&
export GIT_INDEX_FILE &&
git-diff-files --name-only -z |
git-update-index --remove -z --stdin
)
) || exit
;;
,t)
save_index &&
git-ls-files --error-unmatch -- "$@" >/dev/null || exit

git-diff-files --name-only -z -- "$@" |
(
cd "$TOP"
GIT_INDEX_FILE="$NEXT_INDEX"
export GIT_INDEX_FILE
cd_to_toplevel &&
GIT_INDEX_FILE="$NEXT_INDEX" &&
export GIT_INDEX_FILE &&
git-update-index --remove -z --stdin
)
) || exit
;;
,)
case "$#" in
Expand Down
6 changes: 1 addition & 5 deletions git-fetch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,8 @@ USAGE='<fetch-options> <repository> <refspec>...'
SUBDIRECTORY_OK=Yes
. git-sh-setup
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
_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"
Expand Down
6 changes: 1 addition & 5 deletions git-reset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,7 @@ then
exit
fi

TOP=$(git-rev-parse --show-cdup)
if test ! -z "$TOP"
then
cd "$TOP"
fi
cd_to_toplevel

if test "$reset_type" = "--hard"
then
Expand Down

0 comments on commit 514c09f

Please sign in to comment.