3 USAGE
='[-f] [-b <new_branch>] [-m] [<branch>] [<paths>...]'
4 SUBDIRECTORY_OK
=Sometimes
8 old
=$
(git-rev-parse
--verify $old_name 2>/dev
/null
)
16 while [ "$#" != "0" ]; do
23 [ -z "$newbranch" ] &&
24 die
"git checkout: -b needs a branch name"
25 git-show-ref
--verify --quiet -- "refs/heads/$newbranch" &&
26 die
"git checkout: branch $newbranch already exists"
27 git-check-ref-format
"heads/$newbranch" ||
28 die
"git checkout: we do not like '$newbranch' as a branch name."
46 if rev=$
(git-rev-parse
--verify "$arg^0" 2>/dev
/null
)
48 if [ -z "$rev" ]; then
49 echo "unknown flag $arg"
54 if git-show-ref
--verify --quiet -- "refs/heads/$arg"
58 elif rev=$
(git-rev-parse
--verify "$arg^{tree}" 2>/dev
/null
)
60 # checking out selected paths from a tree-ish.
62 new_name
="$arg^{tree}"
80 case "$force$merge" in
82 die
"git checkout: -f and -m are incompatible"
85 # The behaviour of the command with and without explicit path
86 # parameters is quite different.
88 # Without paths, we are checking out everything in the work tree,
89 # possibly switching branches. This is the traditional behaviour.
91 # With paths, we are _never_ switching branch, but checking out
92 # the named paths from either index (when no rev is given),
93 # or the named tree-ish (when rev is given).
101 Did you intend to checkout '$@' which can not be resolved as commit?"
103 if test '' != "$newbranch$force$merge"
105 die
"git checkout: updating paths is incompatible with switching branches/forcing$hint"
109 # from a specific tree-ish; note that this is for
110 # rescuing paths and is never meant to remove what
111 # is not in the named tree-ish.
112 git-ls-tree
--full-name -r "$new" "$@" |
113 git-update-index
--index-info ||
exit $?
115 git-checkout-index
-f -u -- "$@"
118 # Make sure we did not fall back on $arg^{tree} codepath
119 # since we are not checking out from an arbitrary tree-ish,
120 # but switching branches.
123 git-rev-parse
--verify "$new^{commit}" >/dev
/null
2>&1 ||
124 die
"Cannot switch branch to a non-commit."
128 # We are switching branches and checking out trees, so
129 # we *NEED* to be at the toplevel.
130 cdup
=$
(git-rev-parse
--show-cdup)
136 [ -z "$new" ] && new
=$old && new_name
="$old_name"
138 # If we don't have an old branch that we're switching to,
139 # and we don't have a new branch name for the target we
140 # are switching to, then we'd better just be checking out
141 # what we already had
143 [ -z "$branch$newbranch" ] &&
144 [ "$new" != "$old" ] &&
145 die
"git checkout: to checkout the requested commit you need to specify
146 a name for a new branch which is created and switched to"
150 echo "warning: You do not appear to currently be on a branch." >&2
151 echo "warning: Forcing checkout of $new_name." >&2
157 git-read-tree
--reset -u $new
159 git-update-index
--refresh >/dev
/null
160 merge_error
=$
(git-read-tree
-m -u $old $new 2>&1) ||
(
163 echo >&2 "$merge_error"
167 # Match the index to the working tree, and do a three-way.
168 git diff-files
--name-only | git update-index
--remove --stdin &&
169 work
=`git write-tree` &&
170 git read-tree
--reset -u $new &&
171 git read-tree
-m -u --aggressive $old $new $work ||
exit
173 if result
=`git write-tree 2>/dev/null`
175 echo >&2 "Trivially automerged."
177 git merge-index
-o git-merge-one-file
-a
180 # Do not register the cleanly merged paths in the index yet.
181 # this is not a real merge before committing, but just carrying
182 # the working tree changes along.
183 unmerged
=`git ls-files -u`
184 git read-tree
--reset $new
189 z40
=0000000000000000000000000000000000000000
191 sed -e 's/^[0-7]* [0-9a-f]* /'"0 $z40 /"
193 ) | git update-index
--index-info
199 if test "$saved_err" = 0
201 test "$new" = "$old" || git diff-index
--name-status "$new"
207 # Switch the HEAD pointer to the new branch if we
208 # checked out a branch head, and remove any potential
209 # old MERGE_HEAD's (subsequent commits will clearly not
210 # be based on them, since we re-set the index)
212 if [ "$?" -eq 0 ]; then
213 if [ "$newbranch" ]; then
214 if [ "$newbranch_log" ]; then
215 mkdir
-p $
(dirname "$GIT_DIR/logs/refs/heads/$newbranch")
216 touch "$GIT_DIR/logs/refs/heads/$newbranch"
218 git-update-ref
-m "checkout: Created from $new_name" "refs/heads/$newbranch" $new ||
exit
222 GIT_DIR
="$GIT_DIR" git-symbolic-ref HEAD
"refs/heads/$branch"
223 rm -f "$GIT_DIR/MERGE_HEAD"