Skip to content

Commit

Permalink
Merge branch 'jc/subdir'
Browse files Browse the repository at this point in the history
* jc/subdir:
  Allow whole-tree operations to be started from a subdirectory
  Use cd_to_toplevel in scripts that implement it by hand.
  Define cd_to_toplevel shell function in git-sh-setup
  • Loading branch information
Junio C Hamano committed Jan 14, 2007
2 parents e6e2bd6 + 533b703 commit 3681d40
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 31 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
4 changes: 3 additions & 1 deletion git-merge.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,14 @@

USAGE='[-n] [--no-commit] [--squash] [-s <strategy>] [-m=<merge-message>] <commit>+'

SUBDIRECTORY_OK=Yes
. git-sh-setup
set_reflog_action "merge $*"
require_work_tree
cd_to_toplevel

test -z "$(git ls-files -u)" ||
die "You are in a middle of conflicted merge."
die "You are in the middle of a conflicted merge."

LF='
'
Expand Down
4 changes: 3 additions & 1 deletion git-pull.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@

USAGE='[-n | --no-summary] [--no-commit] [-s strategy]... [<fetch-options>] <repo> <head>...'
LONG_USAGE='Fetch one or more remote refs and merge it/them into the current HEAD.'
SUBDIRECTORY_OK=Yes
. git-sh-setup
set_reflog_action "pull $*"
require_work_tree
cd_to_toplevel

test -z "$(git ls-files -u)" ||
die "You are in a middle of conflicted merge."
die "You are in the middle of a conflicted merge."

strategy_args= no_summary= no_commit= squash=
while case "$#,$1" in 0) break ;; *,-*) ;; *) break ;; esac
Expand Down
3 changes: 3 additions & 0 deletions git-rebase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,12 @@ Example: git-rebase master~1 topic
/ --> /
D---E---F---G master D---E---F---G master
'

SUBDIRECTORY_OK=Yes
. git-sh-setup
set_reflog_action rebase
require_work_tree
cd_to_toplevel

RESOLVEMSG="
When you have resolved this problem run \"git rebase --continue\".
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
3 changes: 3 additions & 0 deletions git-revert.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,11 @@ case "$0" in
echo >&2 "What are you talking about?"
exit 1 ;;
esac

SUBDIRECTORY_OK=Yes ;# we will cd up
. git-sh-setup
require_work_tree
cd_to_toplevel

no_commit=
while case "$#" in 0) break ;; esac
Expand Down
11 changes: 11 additions & 0 deletions git-sh-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,17 @@ is_bare_repository () {
esac
}

cd_to_toplevel () {
cdup=$(git-rev-parse --show-cdup)
if test ! -z "$cdup"
then
cd "$cdup" || {
echo >&2 "Cannot chdir to $cdup, the toplevel of the working tree"
exit 1
}
fi
}

require_work_tree () {
test $(is_bare_repository) = false ||
die "fatal: $0 cannot be used without a working tree."
Expand Down

0 comments on commit 3681d40

Please sign in to comment.