]>
Commit | Line | Data |
---|---|---|
303e5f4c | 1 | #!/bin/sh |
b33e9666 | 2 | |
6124aee5 | 3 | USAGE='[-q] [-f] [-b <new_branch>] [-m] [<branch>] [<paths>...]' |
104f3e03 | 4 | SUBDIRECTORY_OK=Sometimes |
806f36d4 | 5 | . git-sh-setup |
7eff28a9 | 6 | require_work_tree |
b0bafe03 | 7 | |
969d326d | 8 | old_name=HEAD |
5a03e7f2 | 9 | old=$(git-rev-parse --verify $old_name 2>/dev/null) |
64886104 | 10 | oldbranch=$(git-symbolic-ref $old_name 2>/dev/null) |
e8b11749 | 11 | new= |
969d326d | 12 | new_name= |
a79944d7 | 13 | force= |
e8b11749 | 14 | branch= |
0746d19a | 15 | track= |
91dcdfd3 | 16 | newbranch= |
969d326d | 17 | newbranch_log= |
1be0659e | 18 | merge= |
6124aee5 | 19 | quiet= |
4c474b6f | 20 | v=-v |
ead80606 JH |
21 | LF=' |
22 | ' | |
e8b11749 LT |
23 | while [ "$#" != "0" ]; do |
24 | arg="$1" | |
25 | shift | |
26 | case "$arg" in | |
91dcdfd3 LT |
27 | "-b") |
28 | newbranch="$1" | |
29 | shift | |
30 | [ -z "$newbranch" ] && | |
31 | die "git checkout: -b needs a branch name" | |
305e22c3 | 32 | git-show-ref --verify --quiet -- "refs/heads/$newbranch" && |
91dcdfd3 | 33 | die "git checkout: branch $newbranch already exists" |
03feddd6 | 34 | git-check-ref-format "heads/$newbranch" || |
babfaf8d | 35 | die "git checkout: we do not like '$newbranch' as a branch name." |
91dcdfd3 | 36 | ;; |
969d326d | 37 | "-l") |
0746d19a PB |
38 | newbranch_log=-l |
39 | ;; | |
40 | "--track"|"--no-track") | |
41 | track="$arg" | |
969d326d | 42 | ;; |
303e5f4c | 43 | "-f") |
e8b11749 | 44 | force=1 |
303e5f4c | 45 | ;; |
1be0659e JH |
46 | -m) |
47 | merge=1 | |
48 | ;; | |
6124aee5 NP |
49 | "-q") |
50 | quiet=1 | |
4c474b6f | 51 | v= |
6124aee5 | 52 | ;; |
4aaa7027 JH |
53 | --) |
54 | break | |
55 | ;; | |
b0bafe03 CS |
56 | -*) |
57 | usage | |
58 | ;; | |
303e5f4c | 59 | *) |
4aaa7027 JH |
60 | if rev=$(git-rev-parse --verify "$arg^0" 2>/dev/null) |
61 | then | |
62 | if [ -z "$rev" ]; then | |
63 | echo "unknown flag $arg" | |
64 | exit 1 | |
65 | fi | |
66 | new="$rev" | |
8d78b5af | 67 | new_name="$arg" |
305e22c3 LT |
68 | if git-show-ref --verify --quiet -- "refs/heads/$arg" |
69 | then | |
4aaa7027 JH |
70 | branch="$arg" |
71 | fi | |
72 | elif rev=$(git-rev-parse --verify "$arg^{tree}" 2>/dev/null) | |
73 | then | |
74 | # checking out selected paths from a tree-ish. | |
75 | new="$rev" | |
969d326d | 76 | new_name="$arg^{tree}" |
4aaa7027 JH |
77 | branch= |
78 | else | |
79 | new= | |
969d326d | 80 | new_name= |
4aaa7027 JH |
81 | branch= |
82 | set x "$arg" "$@" | |
83 | shift | |
e8b11749 | 84 | fi |
2608003f JH |
85 | case "$1" in |
86 | --) | |
87 | shift ;; | |
88 | esac | |
4aaa7027 | 89 | break |
e8b11749 | 90 | ;; |
303e5f4c | 91 | esac |
303e5f4c LT |
92 | done |
93 | ||
9debc324 | 94 | case "$newbranch,$track" in |
0746d19a PB |
95 | ,--*) |
96 | die "git checkout: --track and --no-track require -b" | |
97 | esac | |
98 | ||
897643cc JH |
99 | case "$force$merge" in |
100 | 11) | |
101 | die "git checkout: -f and -m are incompatible" | |
102 | esac | |
103 | ||
4aaa7027 JH |
104 | # The behaviour of the command with and without explicit path |
105 | # parameters is quite different. | |
106 | # | |
107 | # Without paths, we are checking out everything in the work tree, | |
108 | # possibly switching branches. This is the traditional behaviour. | |
91dcdfd3 | 109 | # |
4aaa7027 JH |
110 | # With paths, we are _never_ switching branch, but checking out |
111 | # the named paths from either index (when no rev is given), | |
112 | # or the named tree-ish (when rev is given). | |
113 | ||
114 | if test "$#" -ge 1 | |
115 | then | |
babfaf8d JW |
116 | hint= |
117 | if test "$#" -eq 1 | |
118 | then | |
119 | hint=" | |
120 | Did you intend to checkout '$@' which can not be resolved as commit?" | |
121 | fi | |
1be0659e | 122 | if test '' != "$newbranch$force$merge" |
4aaa7027 | 123 | then |
babfaf8d | 124 | die "git checkout: updating paths is incompatible with switching branches/forcing$hint" |
4aaa7027 JH |
125 | fi |
126 | if test '' != "$new" | |
127 | then | |
128 | # from a specific tree-ish; note that this is for | |
129 | # rescuing paths and is never meant to remove what | |
130 | # is not in the named tree-ish. | |
d0d14cf3 | 131 | git-ls-tree --full-name -r "$new" "$@" | |
4aaa7027 JH |
132 | git-update-index --index-info || exit $? |
133 | fi | |
bf7e1472 JH |
134 | |
135 | # Make sure the request is about existing paths. | |
136 | git-ls-files --error-unmatch -- "$@" >/dev/null || exit | |
137 | git-ls-files -- "$@" | | |
138 | git-checkout-index -f -u --stdin | |
4aaa7027 JH |
139 | exit $? |
140 | else | |
141 | # Make sure we did not fall back on $arg^{tree} codepath | |
142 | # since we are not checking out from an arbitrary tree-ish, | |
143 | # but switching branches. | |
144 | if test '' != "$new" | |
145 | then | |
146 | git-rev-parse --verify "$new^{commit}" >/dev/null 2>&1 || | |
147 | die "Cannot switch branch to a non-commit." | |
148 | fi | |
149 | fi | |
150 | ||
104f3e03 JH |
151 | # We are switching branches and checking out trees, so |
152 | # we *NEED* to be at the toplevel. | |
514c09fd | 153 | cd_to_toplevel |
104f3e03 | 154 | |
969d326d | 155 | [ -z "$new" ] && new=$old && new_name="$old_name" |
4aaa7027 | 156 | |
73c838e4 | 157 | # If we don't have an existing branch that we're switching to, |
91dcdfd3 | 158 | # and we don't have a new branch name for the target we |
73c838e4 JH |
159 | # are switching to, then we are detaching our HEAD from any |
160 | # branch. However, if "git checkout HEAD" detaches the HEAD | |
161 | # from the current branch, even though that may be logically | |
162 | # correct, it feels somewhat funny. More importantly, we do not | |
163 | # want "git checkout" nor "git checkout -f" to detach HEAD. | |
4aaa7027 | 164 | |
bfbbb8f8 JH |
165 | detached= |
166 | detach_warn= | |
167 | ||
abba9dbb JH |
168 | describe_detached_head () { |
169 | test -n "$quiet" || { | |
170 | printf >&2 "$1 " | |
171 | GIT_PAGER= git log >&2 -1 --pretty=oneline --abbrev-commit "$2" | |
172 | } | |
173 | } | |
174 | ||
3e0318a3 | 175 | if test -z "$branch$newbranch" && test "$new_name" != "$old_name" |
c847f537 | 176 | then |
bfbbb8f8 | 177 | detached="$new" |
6124aee5 | 178 | if test -n "$oldbranch" && test -z "$quiet" |
64886104 | 179 | then |
92cf9569 | 180 | detach_warn="Note: moving to \"$new_name\" which isn't a local branch |
d117452a NP |
181 | If you want to create a new branch from this checkout, you may do so |
182 | (now or later) by using -b with the checkout command again. Example: | |
eb3204df | 183 | git checkout -b <new_branch_name>" |
64886104 | 184 | fi |
3e0318a3 | 185 | elif test -z "$oldbranch" && test "$new" != "$old" |
ead80606 | 186 | then |
abba9dbb | 187 | describe_detached_head 'Previous HEAD position was' "$old" |
c847f537 | 188 | fi |
91dcdfd3 | 189 | |
5a03e7f2 SP |
190 | if [ "X$old" = X ] |
191 | then | |
6124aee5 NP |
192 | if test -z "$quiet" |
193 | then | |
194 | echo >&2 "warning: You appear to be on a branch yet to be born." | |
195 | echo >&2 "warning: Forcing checkout of $new_name." | |
196 | fi | |
5a03e7f2 SP |
197 | force=1 |
198 | fi | |
199 | ||
a79944d7 | 200 | if [ "$force" ] |
303e5f4c | 201 | then |
4c474b6f | 202 | git-read-tree $v --reset -u $new |
303e5f4c | 203 | else |
7f88c846 | 204 | git-update-index --refresh >/dev/null |
11271480 | 205 | merge_error=$(git-read-tree -m -u --exclude-per-directory=.gitignore $old $new 2>&1) || ( |
1be0659e JH |
206 | case "$merge" in |
207 | '') | |
208 | echo >&2 "$merge_error" | |
209 | exit 1 ;; | |
19205acf JH |
210 | esac |
211 | ||
1be0659e JH |
212 | # Match the index to the working tree, and do a three-way. |
213 | git diff-files --name-only | git update-index --remove --stdin && | |
19205acf | 214 | work=`git write-tree` && |
4c474b6f | 215 | git read-tree $v --reset -u $new || exit |
1be0659e | 216 | |
41f5d733 | 217 | eval GITHEAD_$new='${new_name:-${branch:-$new}}' && |
d7ebd53d JH |
218 | eval GITHEAD_$work=local && |
219 | export GITHEAD_$new GITHEAD_$work && | |
220 | git merge-recursive $old -- $new $work | |
1be0659e JH |
221 | |
222 | # Do not register the cleanly merged paths in the index yet. | |
223 | # this is not a real merge before committing, but just carrying | |
224 | # the working tree changes along. | |
225 | unmerged=`git ls-files -u` | |
4c474b6f | 226 | git read-tree $v --reset $new |
1be0659e JH |
227 | case "$unmerged" in |
228 | '') ;; | |
229 | *) | |
230 | ( | |
231 | z40=0000000000000000000000000000000000000000 | |
232 | echo "$unmerged" | | |
233 | sed -e 's/^[0-7]* [0-9a-f]* /'"0 $z40 /" | |
234 | echo "$unmerged" | |
235 | ) | git update-index --index-info | |
236 | ;; | |
237 | esac | |
238 | exit 0 | |
19205acf | 239 | ) |
980d8ce5 | 240 | saved_err=$? |
6124aee5 | 241 | if test "$saved_err" = 0 && test -z "$quiet" |
504fe714 | 242 | then |
e4b0e4ab | 243 | git diff-index --name-status "$new" |
504fe714 | 244 | fi |
980d8ce5 | 245 | (exit $saved_err) |
ef0bfa25 LT |
246 | fi |
247 | ||
248 | # | |
01385e27 | 249 | # Switch the HEAD pointer to the new branch if we |
ef0bfa25 LT |
250 | # checked out a branch head, and remove any potential |
251 | # old MERGE_HEAD's (subsequent commits will clearly not | |
252 | # be based on them, since we re-set the index) | |
253 | # | |
254 | if [ "$?" -eq 0 ]; then | |
91dcdfd3 | 255 | if [ "$newbranch" ]; then |
0746d19a | 256 | git-branch $track $newbranch_log "$newbranch" "$new_name" || exit |
91dcdfd3 LT |
257 | branch="$newbranch" |
258 | fi | |
bfbbb8f8 JH |
259 | if test -n "$branch" |
260 | then | |
a7e4fbf9 | 261 | GIT_DIR="$GIT_DIR" git-symbolic-ref -m "checkout: moving to $branch" HEAD "refs/heads/$branch" |
57216856 | 262 | if test -n "$quiet" |
e4b0e4ab | 263 | then |
57216856 NP |
264 | true # nothing |
265 | elif test "refs/heads/$branch" = "$oldbranch" | |
266 | then | |
267 | echo >&2 "Already on branch \"$branch\"" | |
268 | else | |
6124aee5 | 269 | echo >&2 "Switched to${newbranch:+ a new} branch \"$branch\"" |
e4b0e4ab | 270 | fi |
bfbbb8f8 JH |
271 | elif test -n "$detached" |
272 | then | |
273 | # NEEDSWORK: we would want a command to detach the HEAD | |
274 | # atomically, instead of this handcrafted command sequence. | |
275 | # Perhaps: | |
276 | # git update-ref --detach HEAD $new | |
277 | # or something like that... | |
278 | # | |
e1dde3d0 NP |
279 | git-rev-parse HEAD >"$GIT_DIR/HEAD.new" && |
280 | mv "$GIT_DIR/HEAD.new" "$GIT_DIR/HEAD" && | |
281 | git-update-ref -m "checkout: moving to $arg" HEAD "$detached" || | |
bfbbb8f8 JH |
282 | die "Cannot detach HEAD" |
283 | if test -n "$detach_warn" | |
284 | then | |
285 | echo >&2 "$detach_warn" | |
286 | fi | |
abba9dbb | 287 | describe_detached_head 'HEAD is now at' HEAD |
bfbbb8f8 | 288 | fi |
ef0bfa25 | 289 | rm -f "$GIT_DIR/MERGE_HEAD" |
ab22707f TL |
290 | else |
291 | exit 1 | |
ef0bfa25 | 292 | fi |