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