]>
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= |
91dcdfd3 | 15 | newbranch= |
969d326d | 16 | newbranch_log= |
1be0659e | 17 | merge= |
6124aee5 | 18 | quiet= |
ead80606 JH |
19 | LF=' |
20 | ' | |
e8b11749 LT |
21 | while [ "$#" != "0" ]; do |
22 | arg="$1" | |
23 | shift | |
24 | case "$arg" in | |
91dcdfd3 LT |
25 | "-b") |
26 | newbranch="$1" | |
27 | shift | |
28 | [ -z "$newbranch" ] && | |
29 | die "git checkout: -b needs a branch name" | |
305e22c3 | 30 | git-show-ref --verify --quiet -- "refs/heads/$newbranch" && |
91dcdfd3 | 31 | die "git checkout: branch $newbranch already exists" |
03feddd6 | 32 | git-check-ref-format "heads/$newbranch" || |
babfaf8d | 33 | die "git checkout: we do not like '$newbranch' as a branch name." |
91dcdfd3 | 34 | ;; |
969d326d SP |
35 | "-l") |
36 | newbranch_log=1 | |
37 | ;; | |
303e5f4c | 38 | "-f") |
e8b11749 | 39 | force=1 |
303e5f4c | 40 | ;; |
1be0659e JH |
41 | -m) |
42 | merge=1 | |
43 | ;; | |
6124aee5 NP |
44 | "-q") |
45 | quiet=1 | |
46 | ;; | |
4aaa7027 JH |
47 | --) |
48 | break | |
49 | ;; | |
b0bafe03 CS |
50 | -*) |
51 | usage | |
52 | ;; | |
303e5f4c | 53 | *) |
4aaa7027 JH |
54 | if rev=$(git-rev-parse --verify "$arg^0" 2>/dev/null) |
55 | then | |
56 | if [ -z "$rev" ]; then | |
57 | echo "unknown flag $arg" | |
58 | exit 1 | |
59 | fi | |
60 | new="$rev" | |
8d78b5af | 61 | new_name="$arg" |
305e22c3 LT |
62 | if git-show-ref --verify --quiet -- "refs/heads/$arg" |
63 | then | |
4aaa7027 JH |
64 | branch="$arg" |
65 | fi | |
66 | elif rev=$(git-rev-parse --verify "$arg^{tree}" 2>/dev/null) | |
67 | then | |
68 | # checking out selected paths from a tree-ish. | |
69 | new="$rev" | |
969d326d | 70 | new_name="$arg^{tree}" |
4aaa7027 JH |
71 | branch= |
72 | else | |
73 | new= | |
969d326d | 74 | new_name= |
4aaa7027 JH |
75 | branch= |
76 | set x "$arg" "$@" | |
77 | shift | |
e8b11749 | 78 | fi |
2608003f JH |
79 | case "$1" in |
80 | --) | |
81 | shift ;; | |
82 | esac | |
4aaa7027 | 83 | break |
e8b11749 | 84 | ;; |
303e5f4c | 85 | esac |
303e5f4c LT |
86 | done |
87 | ||
897643cc JH |
88 | case "$force$merge" in |
89 | 11) | |
90 | die "git checkout: -f and -m are incompatible" | |
91 | esac | |
92 | ||
4aaa7027 JH |
93 | # The behaviour of the command with and without explicit path |
94 | # parameters is quite different. | |
95 | # | |
96 | # Without paths, we are checking out everything in the work tree, | |
97 | # possibly switching branches. This is the traditional behaviour. | |
91dcdfd3 | 98 | # |
4aaa7027 JH |
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). | |
102 | ||
103 | if test "$#" -ge 1 | |
104 | then | |
babfaf8d JW |
105 | hint= |
106 | if test "$#" -eq 1 | |
107 | then | |
108 | hint=" | |
109 | Did you intend to checkout '$@' which can not be resolved as commit?" | |
110 | fi | |
1be0659e | 111 | if test '' != "$newbranch$force$merge" |
4aaa7027 | 112 | then |
babfaf8d | 113 | die "git checkout: updating paths is incompatible with switching branches/forcing$hint" |
4aaa7027 JH |
114 | fi |
115 | if test '' != "$new" | |
116 | then | |
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. | |
d0d14cf3 | 120 | git-ls-tree --full-name -r "$new" "$@" | |
4aaa7027 JH |
121 | git-update-index --index-info || exit $? |
122 | fi | |
bf7e1472 JH |
123 | |
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 | |
4aaa7027 JH |
128 | exit $? |
129 | else | |
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. | |
133 | if test '' != "$new" | |
134 | then | |
135 | git-rev-parse --verify "$new^{commit}" >/dev/null 2>&1 || | |
136 | die "Cannot switch branch to a non-commit." | |
137 | fi | |
138 | fi | |
139 | ||
104f3e03 JH |
140 | # We are switching branches and checking out trees, so |
141 | # we *NEED* to be at the toplevel. | |
514c09fd | 142 | cd_to_toplevel |
104f3e03 | 143 | |
969d326d | 144 | [ -z "$new" ] && new=$old && new_name="$old_name" |
4aaa7027 | 145 | |
73c838e4 | 146 | # If we don't have an existing branch that we're switching to, |
91dcdfd3 | 147 | # and we don't have a new branch name for the target we |
73c838e4 JH |
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. | |
4aaa7027 | 153 | |
bfbbb8f8 JH |
154 | detached= |
155 | detach_warn= | |
156 | ||
c847f537 JH |
157 | if test -z "$branch$newbranch" && test "$new" != "$old" |
158 | then | |
bfbbb8f8 | 159 | detached="$new" |
6124aee5 | 160 | if test -n "$oldbranch" && test -z "$quiet" |
64886104 | 161 | then |
92cf9569 | 162 | detach_warn="Note: moving to \"$new_name\" which isn't a local branch |
d117452a NP |
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: | |
eb3204df | 165 | git checkout -b <new_branch_name>" |
64886104 | 166 | fi |
dc9195ac | 167 | elif test -z "$oldbranch" && test -z "$quiet" |
ead80606 | 168 | then |
dc9195ac | 169 | echo >&2 "Previous HEAD position was $old" |
c847f537 | 170 | fi |
91dcdfd3 | 171 | |
5a03e7f2 SP |
172 | if [ "X$old" = X ] |
173 | then | |
6124aee5 NP |
174 | if test -z "$quiet" |
175 | then | |
176 | echo >&2 "warning: You appear to be on a branch yet to be born." | |
177 | echo >&2 "warning: Forcing checkout of $new_name." | |
178 | fi | |
5a03e7f2 SP |
179 | force=1 |
180 | fi | |
181 | ||
a79944d7 | 182 | if [ "$force" ] |
303e5f4c | 183 | then |
4170af82 | 184 | git-read-tree --reset -u $new |
303e5f4c | 185 | else |
7f88c846 | 186 | git-update-index --refresh >/dev/null |
11271480 | 187 | merge_error=$(git-read-tree -m -u --exclude-per-directory=.gitignore $old $new 2>&1) || ( |
1be0659e JH |
188 | case "$merge" in |
189 | '') | |
190 | echo >&2 "$merge_error" | |
191 | exit 1 ;; | |
19205acf JH |
192 | esac |
193 | ||
1be0659e JH |
194 | # Match the index to the working tree, and do a three-way. |
195 | git diff-files --name-only | git update-index --remove --stdin && | |
19205acf | 196 | work=`git write-tree` && |
d7ebd53d | 197 | git read-tree --reset -u $new || exit |
1be0659e | 198 | |
d7ebd53d JH |
199 | eval GITHEAD_$new=${new_name:-${branch:-$new}} && |
200 | eval GITHEAD_$work=local && | |
201 | export GITHEAD_$new GITHEAD_$work && | |
202 | git merge-recursive $old -- $new $work | |
1be0659e JH |
203 | |
204 | # Do not register the cleanly merged paths in the index yet. | |
205 | # this is not a real merge before committing, but just carrying | |
206 | # the working tree changes along. | |
207 | unmerged=`git ls-files -u` | |
208 | git read-tree --reset $new | |
209 | case "$unmerged" in | |
210 | '') ;; | |
211 | *) | |
212 | ( | |
213 | z40=0000000000000000000000000000000000000000 | |
214 | echo "$unmerged" | | |
215 | sed -e 's/^[0-7]* [0-9a-f]* /'"0 $z40 /" | |
216 | echo "$unmerged" | |
217 | ) | git update-index --index-info | |
218 | ;; | |
219 | esac | |
220 | exit 0 | |
19205acf | 221 | ) |
980d8ce5 | 222 | saved_err=$? |
6124aee5 | 223 | if test "$saved_err" = 0 && test -z "$quiet" |
504fe714 | 224 | then |
e4b0e4ab | 225 | git diff-index --name-status "$new" |
504fe714 | 226 | fi |
980d8ce5 | 227 | (exit $saved_err) |
ef0bfa25 LT |
228 | fi |
229 | ||
230 | # | |
01385e27 | 231 | # Switch the HEAD pointer to the new branch if we |
ef0bfa25 LT |
232 | # checked out a branch head, and remove any potential |
233 | # old MERGE_HEAD's (subsequent commits will clearly not | |
234 | # be based on them, since we re-set the index) | |
235 | # | |
236 | if [ "$?" -eq 0 ]; then | |
91dcdfd3 | 237 | if [ "$newbranch" ]; then |
969d326d | 238 | if [ "$newbranch_log" ]; then |
d7fb7a37 SP |
239 | mkdir -p $(dirname "$GIT_DIR/logs/refs/heads/$newbranch") |
240 | touch "$GIT_DIR/logs/refs/heads/$newbranch" | |
969d326d SP |
241 | fi |
242 | git-update-ref -m "checkout: Created from $new_name" "refs/heads/$newbranch" $new || exit | |
91dcdfd3 LT |
243 | branch="$newbranch" |
244 | fi | |
bfbbb8f8 JH |
245 | if test -n "$branch" |
246 | then | |
a7e4fbf9 | 247 | GIT_DIR="$GIT_DIR" git-symbolic-ref -m "checkout: moving to $branch" HEAD "refs/heads/$branch" |
6124aee5 | 248 | if test -z "$quiet" |
e4b0e4ab | 249 | then |
6124aee5 | 250 | echo >&2 "Switched to${newbranch:+ a new} branch \"$branch\"" |
e4b0e4ab | 251 | fi |
bfbbb8f8 JH |
252 | elif test -n "$detached" |
253 | then | |
254 | # NEEDSWORK: we would want a command to detach the HEAD | |
255 | # atomically, instead of this handcrafted command sequence. | |
256 | # Perhaps: | |
257 | # git update-ref --detach HEAD $new | |
258 | # or something like that... | |
259 | # | |
e1dde3d0 NP |
260 | git-rev-parse HEAD >"$GIT_DIR/HEAD.new" && |
261 | mv "$GIT_DIR/HEAD.new" "$GIT_DIR/HEAD" && | |
262 | git-update-ref -m "checkout: moving to $arg" HEAD "$detached" || | |
bfbbb8f8 JH |
263 | die "Cannot detach HEAD" |
264 | if test -n "$detach_warn" | |
265 | then | |
266 | echo >&2 "$detach_warn" | |
267 | fi | |
268 | fi | |
ef0bfa25 | 269 | rm -f "$GIT_DIR/MERGE_HEAD" |
ab22707f TL |
270 | else |
271 | exit 1 | |
ef0bfa25 | 272 | fi |