3 USAGE='[-q] [-f] [-b <new_branch>] [-m] [<branch>] [<paths>...]'
4 SUBDIRECTORY_OK=Sometimes
9 old=$(git-rev-parse --verify $old_name 2>/dev/null)
10 oldbranch=$(git-symbolic-ref $old_name 2>/dev/null)
21 while [ "$#" != "0" ]; do
28 [ -z "$newbranch" ] &&
29 die "git checkout: -b needs a branch name"
30 git-show-ref --verify --quiet -- "refs/heads/$newbranch" &&
31 die "git checkout: branch $newbranch already exists"
32 git-check-ref-format "heads/$newbranch" ||
33 die "git checkout: we do not like '$newbranch' as a branch name."
54 if rev=$(git-rev-parse --verify "$arg^0" 2>/dev/null)
56 if [ -z "$rev" ]; then
57 echo "unknown flag $arg"
62 if git-show-ref --verify --quiet -- "refs/heads/$arg"
66 elif rev=$(git-rev-parse --verify "$arg^{tree}" 2>/dev/null)
68 # checking out selected paths from a tree-ish.
70 new_name="$arg^{tree}"
88 case "$force$merge" in
90 die "git checkout: -f and -m are incompatible"
93 # The behaviour of the command with and without explicit path
94 # parameters is quite different.
96 # Without paths, we are checking out everything in the work tree,
97 # possibly switching branches. This is the traditional behaviour.
99 # With paths, we are _never_ switching branch, but checking out
100 # the named paths from either index (when no rev is given),
101 # or the named tree-ish (when rev is given).
109 Did you intend to checkout '$@' which can not be resolved as commit?"
111 if test '' != "$newbranch$force$merge"
113 die "git checkout: updating paths is incompatible with switching branches/forcing$hint"
117 # from a specific tree-ish; note that this is for
118 # rescuing paths and is never meant to remove what
119 # is not in the named tree-ish.
120 git-ls-tree --full-name -r "$new" "$@" |
121 git-update-index --index-info || exit $?
124 # Make sure the request is about existing paths.
125 git-ls-files --error-unmatch -- "$@" >/dev/null || exit
126 git-ls-files -- "$@" |
127 git-checkout-index -f -u --stdin
130 # Make sure we did not fall back on $arg^{tree} codepath
131 # since we are not checking out from an arbitrary tree-ish,
132 # but switching branches.
135 git-rev-parse --verify "$new^{commit}" >/dev/null 2>&1 ||
136 die "Cannot switch branch to a non-commit."
140 # We are switching branches and checking out trees, so
141 # we *NEED* to be at the toplevel.
144 [ -z "$new" ] && new=$old && new_name="$old_name"
146 # If we don't have an existing branch that we're switching to,
147 # and we don't have a new branch name for the target we
148 # are switching to, then we are detaching our HEAD from any
149 # branch. However, if "git checkout HEAD" detaches the HEAD
150 # from the current branch, even though that may be logically
151 # correct, it feels somewhat funny. More importantly, we do not
152 # want "git checkout" nor "git checkout -f" to detach HEAD.
157 if test -z "$branch$newbranch" && test "$new" != "$old"
160 if test -n "$oldbranch" && test -z "$quiet"
162 detach_warn="Note: moving to \"$new_name\" which isn't a local branch
163 If you want to create a new branch from this checkout, you may do so
164 (now or later) by using -b with the checkout command again. Example:
165 git checkout -b <new_branch_name>"
167 elif test -z "$oldbranch" && test -n "$branch"
172 git show-ref -d -s | grep "$old" >/dev/null || {
174 "You are not on any branch and switching to branch '$new_name'
175 may lose your changes. At this point, you can do one of two things:
176 (1) Decide it is Ok and say 'git checkout -f $new_name';
177 (2) Start a new branch from the current commit, by saying
178 'git checkout -b <branch-name>'.
179 Leaving your HEAD detached; not switching to branch '$new_name'."
189 echo >&2 "warning: You appear to be on a branch yet to be born."
190 echo >&2 "warning: Forcing checkout of $new_name."
197 git-read-tree --reset -u $new
199 git-update-index --refresh >/dev/null
200 merge_error=$(git-read-tree -m -u --exclude-per-directory=.gitignore $old $new 2>&1) || (
203 echo >&2 "$merge_error"
207 # Match the index to the working tree, and do a three-way.
208 git diff-files --name-only | git update-index --remove --stdin &&
209 work=`git write-tree` &&
210 git read-tree --reset -u $new || exit
212 eval GITHEAD_$new=${new_name:-${branch:-$new}} &&
213 eval GITHEAD_$work=local &&
214 export GITHEAD_$new GITHEAD_$work &&
215 git merge-recursive $old -- $new $work
217 # Do not register the cleanly merged paths in the index yet.
218 # this is not a real merge before committing, but just carrying
219 # the working tree changes along.
220 unmerged=`git ls-files -u`
221 git read-tree --reset $new
226 z40=0000000000000000000000000000000000000000
228 sed -e 's/^[0-7]* [0-9a-f]* /'"0 $z40 /"
230 ) | git update-index --index-info
236 if test "$saved_err" = 0 && test -z "$quiet"
238 git diff-index --name-status "$new"
244 # Switch the HEAD pointer to the new branch if we
245 # checked out a branch head, and remove any potential
246 # old MERGE_HEAD's (subsequent commits will clearly not
247 # be based on them, since we re-set the index)
249 if [ "$?" -eq 0 ]; then
250 if [ "$newbranch" ]; then
251 if [ "$newbranch_log" ]; then
252 mkdir -p $(dirname "$GIT_DIR/logs/refs/heads/$newbranch")
253 touch "$GIT_DIR/logs/refs/heads/$newbranch"
255 git-update-ref -m "checkout: Created from $new_name" "refs/heads/$newbranch" $new || exit
260 GIT_DIR="$GIT_DIR" git-symbolic-ref -m "checkout: moving to $branch" HEAD "refs/heads/$branch"
263 echo >&2 "Switched to${newbranch:+ a new} branch \"$branch\""
265 elif test -n "$detached"
267 # NEEDSWORK: we would want a command to detach the HEAD
268 # atomically, instead of this handcrafted command sequence.
270 # git update-ref --detach HEAD $new
271 # or something like that...
273 git-rev-parse HEAD >"$GIT_DIR/HEAD.new" &&
274 mv "$GIT_DIR/HEAD.new" "$GIT_DIR/HEAD" &&
275 git-update-ref -m "checkout: moving to $arg" HEAD "$detached" ||
276 die "Cannot detach HEAD"
277 if test -n "$detach_warn"
279 echo >&2 "$detach_warn"
282 rm -f "$GIT_DIR/MERGE_HEAD"