1 /*
2  * Copyright (c) 2018, 2019, 2020 Stefan Sperling <stsp@openbsd.org>
3  *
4  * Permission to use, copy, modify, and distribute this software for any
5  * purpose with or without fee is hereby granted, provided that the above
6  * copyright notice and this permission notice appear in all copies.
7  *
8  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15  */
16 
17 #include <sys/stat.h>
18 #include <sys/queue.h>
19 
20 #include <dirent.h>
21 #include <limits.h>
22 #include <stddef.h>
23 #include <string.h>
24 #include <stdio.h>
25 #include <stdlib.h>
26 #include <time.h>
27 #include <fcntl.h>
28 #include <errno.h>
29 #include <unistd.h>
30 #include <zlib.h>
31 #include <fnmatch.h>
32 #include <libgen.h>
33 
34 #include "got_compat.h"
35 
36 #include "got_error.h"
37 #include "got_repository.h"
38 #include "got_reference.h"
39 #include "got_object.h"
40 #include "got_path.h"
41 #include "got_cancel.h"
42 #include "got_worktree.h"
43 #include "got_opentemp.h"
44 #include "got_diff.h"
45 
46 #include "got_lib_worktree.h"
47 #include "got_lib_sha1.h"
48 #include "got_lib_fileindex.h"
49 #include "got_lib_inflate.h"
50 #include "got_lib_delta.h"
51 #include "got_lib_object.h"
52 #include "got_lib_object_parse.h"
53 #include "got_lib_object_create.h"
54 #include "got_lib_object_idset.h"
55 #include "got_lib_diff.h"
56 #include "got_lib_gotconfig.h"
57 
58 #ifndef MIN
59 #define	MIN(_a,_b) ((_a) < (_b) ? (_a) : (_b))
60 #endif
61 
62 #define GOT_MERGE_LABEL_MERGED	"merged change"
63 #define GOT_MERGE_LABEL_BASE	"3-way merge base"
64 
65 static mode_t		 apply_umask(mode_t);
66 
67 static const struct got_error *
68 create_meta_file(const char *path_got, const char *name, const char *content)
69 {
70 	const struct got_error *err = NULL;
71 	char *path;
72 
73 	if (asprintf(&path, "%s/%s", path_got, name) == -1)
74 		return got_error_from_errno("asprintf");
75 
76 	err = got_path_create_file(path, content);
77 	free(path);
78 	return err;
79 }
80 
81 static const struct got_error *
82 update_meta_file(const char *path_got, const char *name, const char *content)
83 {
84 	const struct got_error *err = NULL;
85 	FILE *tmpfile = NULL;
86 	char *tmppath = NULL;
87 	char *path = NULL;
88 
89 	if (asprintf(&path, "%s/%s", path_got, name) == -1) {
90 		err = got_error_from_errno("asprintf");
91 		path = NULL;
92 		goto done;
93 	}
94 
95 	err = got_opentemp_named(&tmppath, &tmpfile, path, "");
96 	if (err)
97 		goto done;
98 
99 	if (content) {
100 		int len = fprintf(tmpfile, "%s\n", content);
101 		if (len != strlen(content) + 1) {
102 			err = got_error_from_errno2("fprintf", tmppath);
103 			goto done;
104 		}
105 	}
106 
107 	if (rename(tmppath, path) != 0) {
108 		err = got_error_from_errno3("rename", tmppath, path);
109 		unlink(tmppath);
110 		goto done;
111 	}
112 
113 done:
114 	if (fclose(tmpfile) == EOF && err == NULL)
115 		err = got_error_from_errno2("fclose", tmppath);
116 	free(tmppath);
117 	return err;
118 }
119 
120 static const struct got_error *
121 write_head_ref(const char *path_got, struct got_reference *head_ref)
122 {
123 	const struct got_error *err = NULL;
124 	char *refstr = NULL;
125 
126 	if (got_ref_is_symbolic(head_ref)) {
127 		refstr = got_ref_to_str(head_ref);
128 		if (refstr == NULL)
129 			return got_error_from_errno("got_ref_to_str");
130 	} else {
131 		refstr = strdup(got_ref_get_name(head_ref));
132 		if (refstr == NULL)
133 			return got_error_from_errno("strdup");
134 	}
135 	err = update_meta_file(path_got, GOT_WORKTREE_HEAD_REF, refstr);
136 	free(refstr);
137 	return err;
138 }
139 
140 const struct got_error *
141 got_worktree_init(const char *path, struct got_reference *head_ref,
142     const char *prefix, struct got_repository *repo)
143 {
144 	const struct got_error *err = NULL;
145 	struct got_object_id *commit_id = NULL;
146 	uuid_t uuid;
147 	uint32_t uuid_status;
148 	int obj_type;
149 	char *path_got = NULL;
150 	char *formatstr = NULL;
151 	char *absprefix = NULL;
152 	char *basestr = NULL;
153 	char *uuidstr = NULL;
154 
155 	if (strcmp(path, got_repo_get_path(repo)) == 0) {
156 		err = got_error(GOT_ERR_WORKTREE_REPO);
157 		goto done;
158 	}
159 
160 	err = got_ref_resolve(&commit_id, repo, head_ref);
161 	if (err)
162 		return err;
163 	err = got_object_get_type(&obj_type, repo, commit_id);
164 	if (err)
165 		return err;
166 	if (obj_type != GOT_OBJ_TYPE_COMMIT)
167 		return got_error(GOT_ERR_OBJ_TYPE);
168 
169 	if (!got_path_is_absolute(prefix)) {
170 		if (asprintf(&absprefix, "/%s", prefix) == -1)
171 			return got_error_from_errno("asprintf");
172 	}
173 
174 	/* Create top-level directory (may already exist). */
175 	if (mkdir(path, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
176 		err = got_error_from_errno2("mkdir", path);
177 		goto done;
178 	}
179 
180 	/* Create .got directory (may already exist). */
181 	if (asprintf(&path_got, "%s/%s", path, GOT_WORKTREE_GOT_DIR) == -1) {
182 		err = got_error_from_errno("asprintf");
183 		goto done;
184 	}
185 	if (mkdir(path_got, GOT_DEFAULT_DIR_MODE) == -1 && errno != EEXIST) {
186 		err = got_error_from_errno2("mkdir", path_got);
187 		goto done;
188 	}
189 
190 	/* Create an empty lock file. */
191 	err = create_meta_file(path_got, GOT_WORKTREE_LOCK, NULL);
192 	if (err)
193 		goto done;
194 
195 	/* Create an empty file index. */
196 	err = create_meta_file(path_got, GOT_WORKTREE_FILE_INDEX, NULL);
197 	if (err)
198 		goto done;
199 
200 	/* Write the HEAD reference. */
201 	err = write_head_ref(path_got, head_ref);
202 	if (err)
203 		goto done;
204 
205 	/* Record our base commit. */
206 	err = got_object_id_str(&basestr, commit_id);
207 	if (err)
208 		goto done;
209 	err = create_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, basestr);
210 	if (err)
211 		goto done;
212 
213 	/* Store path to repository. */
214 	err = create_meta_file(path_got, GOT_WORKTREE_REPOSITORY,
215 	    got_repo_get_path(repo));
216 	if (err)
217 		goto done;
218 
219 	/* Store in-repository path prefix. */
220 	err = create_meta_file(path_got, GOT_WORKTREE_PATH_PREFIX,
221 	    absprefix ? absprefix : prefix);
222 	if (err)
223 		goto done;
224 
225 	/* Generate UUID. */
226 	uuid_create(&uuid, &uuid_status);
227 	if (uuid_status != uuid_s_ok) {
228 		err = got_error_uuid(uuid_status, "uuid_create");
229 		goto done;
230 	}
231 	uuid_to_string(&uuid, &uuidstr, &uuid_status);
232 	if (uuid_status != uuid_s_ok) {
233 		err = got_error_uuid(uuid_status, "uuid_to_string");
234 		goto done;
235 	}
236 	err = create_meta_file(path_got, GOT_WORKTREE_UUID, uuidstr);
237 	if (err)
238 		goto done;
239 
240 	/* Stamp work tree with format file. */
241 	if (asprintf(&formatstr, "%d", GOT_WORKTREE_FORMAT_VERSION) == -1) {
242 		err = got_error_from_errno("asprintf");
243 		goto done;
244 	}
245 	err = create_meta_file(path_got, GOT_WORKTREE_FORMAT, formatstr);
246 	if (err)
247 		goto done;
248 
249 done:
250 	free(commit_id);
251 	free(path_got);
252 	free(formatstr);
253 	free(absprefix);
254 	free(basestr);
255 	free(uuidstr);
256 	return err;
257 }
258 
259 const struct got_error *
260 got_worktree_match_path_prefix(int *match, struct got_worktree *worktree,
261     const char *path_prefix)
262 {
263 	char *absprefix = NULL;
264 
265 	if (!got_path_is_absolute(path_prefix)) {
266 		if (asprintf(&absprefix, "/%s", path_prefix) == -1)
267 			return got_error_from_errno("asprintf");
268 	}
269 	*match = (strcmp(absprefix ? absprefix : path_prefix,
270 	    worktree->path_prefix) == 0);
271 	free(absprefix);
272 	return NULL;
273 }
274 
275 const char *
276 got_worktree_get_head_ref_name(struct got_worktree *worktree)
277 {
278 	return worktree->head_ref_name;
279 }
280 
281 const struct got_error *
282 got_worktree_set_head_ref(struct got_worktree *worktree,
283     struct got_reference *head_ref)
284 {
285 	const struct got_error *err = NULL;
286 	char *path_got = NULL, *head_ref_name = NULL;
287 
288 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
289 	    GOT_WORKTREE_GOT_DIR) == -1) {
290 		err = got_error_from_errno("asprintf");
291 		path_got = NULL;
292 		goto done;
293 	}
294 
295 	head_ref_name = strdup(got_ref_get_name(head_ref));
296 	if (head_ref_name == NULL) {
297 		err = got_error_from_errno("strdup");
298 		goto done;
299 	}
300 
301 	err = write_head_ref(path_got, head_ref);
302 	if (err)
303 		goto done;
304 
305 	free(worktree->head_ref_name);
306 	worktree->head_ref_name = head_ref_name;
307 done:
308 	free(path_got);
309 	if (err)
310 		free(head_ref_name);
311 	return err;
312 }
313 
314 struct got_object_id *
315 got_worktree_get_base_commit_id(struct got_worktree *worktree)
316 {
317 	return worktree->base_commit_id;
318 }
319 
320 const struct got_error *
321 got_worktree_set_base_commit_id(struct got_worktree *worktree,
322     struct got_repository *repo, struct got_object_id *commit_id)
323 {
324 	const struct got_error *err;
325 	struct got_object *obj = NULL;
326 	char *id_str = NULL;
327 	char *path_got = NULL;
328 
329 	if (asprintf(&path_got, "%s/%s", worktree->root_path,
330 	    GOT_WORKTREE_GOT_DIR) == -1) {
331 		err = got_error_from_errno("asprintf");
332 		path_got = NULL;
333 		goto done;
334 	}
335 
336 	err = got_object_open(&obj, repo, commit_id);
337 	if (err)
338 		return err;
339 
340 	if (obj->type != GOT_OBJ_TYPE_COMMIT) {
341 		err = got_error(GOT_ERR_OBJ_TYPE);
342 		goto done;
343 	}
344 
345 	/* Record our base commit. */
346 	err = got_object_id_str(&id_str, commit_id);
347 	if (err)
348 		goto done;
349 	err = update_meta_file(path_got, GOT_WORKTREE_BASE_COMMIT, id_str);
350 	if (err)
351 		goto done;
352 
353 	free(worktree->base_commit_id);
354 	worktree->base_commit_id = got_object_id_dup(commit_id);
355 	if (worktree->base_commit_id == NULL) {
356 		err = got_error_from_errno("got_object_id_dup");
357 		goto done;
358 	}
359 done:
360 	if (obj)
361 		got_object_close(obj);
362 	free(id_str);
363 	free(path_got);
364 	return err;
365 }
366 
367 const struct got_gotconfig *
368 got_worktree_get_gotconfig(struct got_worktree *worktree)
369 {
370 	return worktree->gotconfig;
371 }
372 
373 static const struct got_error *
374 lock_worktree(struct got_worktree *worktree, int operation)
375 {
376 	if (flock(worktree->lockfd, operation | LOCK_NB) == -1)
377 		return (errno == EWOULDBLOCK ? got_error(GOT_ERR_WORKTREE_BUSY)
378 		    : got_error_from_errno2("flock",
379 		    got_worktree_get_root_path(worktree)));
380 	return NULL;
381 }
382 
383 static const struct got_error *
384 add_dir_on_disk(struct got_worktree *worktree, const char *path)
385 {
386 	const struct got_error *err = NULL;
387 	char *abspath;
388 
389 	if (asprintf(&abspath, "%s/%s", worktree->root_path, path) == -1)
390 		return got_error_from_errno("asprintf");
391 
392 	err = got_path_mkdir(abspath);
393 	if (err && err->code == GOT_ERR_ERRNO && errno == EEXIST) {
394 		struct stat sb;
395 		err = NULL;
396 		if (lstat(abspath, &sb) == -1) {
397 			err = got_error_from_errno2("lstat", abspath);
398 		} else if (!S_ISDIR(sb.st_mode)) {
399 			/* TODO directory is obstructed; do something */
400 			err = got_error_path(abspath, GOT_ERR_FILE_OBSTRUCTED);
401 		}
402 	}
403 	free(abspath);
404 	return err;
405 }
406 
407 static const struct got_error *
408 check_file_contents_equal(int *same, FILE *f1, FILE *f2)
409 {
410 	const struct got_error *err = NULL;
411 	uint8_t fbuf1[8192];
412 	uint8_t fbuf2[8192];
413 	size_t flen1 = 0, flen2 = 0;
414 
415 	*same = 1;
416 
417 	for (;;) {
418 		flen1 = fread(fbuf1, 1, sizeof(fbuf1), f1);
419 		if (flen1 == 0 && ferror(f1)) {
420 			err = got_error_from_errno("fread");
421 			break;
422 		}
423 		flen2 = fread(fbuf2, 1, sizeof(fbuf2), f2);
424 		if (flen2 == 0 && ferror(f2)) {
425 			err = got_error_from_errno("fread");
426 			break;
427 		}
428 		if (flen1 == 0) {
429 			if (flen2 != 0)
430 				*same = 0;
431 			break;
432 		} else if (flen2 == 0) {
433 			if (flen1 != 0)
434 				*same = 0;
435 			break;
436 		} else if (flen1 == flen2) {
437 			if (memcmp(fbuf1, fbuf2, flen2) != 0) {
438 				*same = 0;
439 				break;
440 			}
441 		} else {
442 			*same = 0;
443 			break;
444 		}
445 	}
446 
447 	return err;
448 }
449 
450 static const struct got_error *
451 check_files_equal(int *same, FILE *f1, FILE *f2)
452 {
453 	struct stat sb;
454 	size_t size1, size2;
455 
456 	*same = 1;
457 
458 	if (fstat(fileno(f1), &sb) != 0)
459 		return got_error_from_errno("fstat");
460 	size1 = sb.st_size;
461 
462 	if (fstat(fileno(f2), &sb) != 0)
463 		return got_error_from_errno("fstat");
464 	size2 = sb.st_size;
465 
466 	if (size1 != size2) {
467 		*same = 0;
468 		return NULL;
469 	}
470 
471 	if (fseek(f1, 0L, SEEK_SET) == -1)
472 		return got_ferror(f1, GOT_ERR_IO);
473 	if (fseek(f2, 0L, SEEK_SET) == -1)
474 		return got_ferror(f2, GOT_ERR_IO);
475 
476 	return check_file_contents_equal(same, f1, f2);
477 }
478 
479 static const struct got_error *
480 copy_file_to_fd(off_t *outsize, FILE *f, int outfd)
481 {
482 	uint8_t fbuf[65536];
483 	size_t flen;
484 	ssize_t outlen;
485 
486 	*outsize = 0;
487 
488 	if (fseek(f, 0L, SEEK_SET) == -1)
489 		return got_ferror(f, GOT_ERR_IO);
490 
491 	for (;;) {
492 		flen = fread(fbuf, 1, sizeof(fbuf), f);
493 		if (flen == 0) {
494 			if (ferror(f))
495 				return got_error_from_errno("fread");
496 			if (feof(f))
497 				break;
498 		}
499 		outlen = write(outfd, fbuf, flen);
500 		if (outlen == -1)
501 			return got_error_from_errno("write");
502 		if (outlen != flen)
503 			return got_error(GOT_ERR_IO);
504 		*outsize += outlen;
505 	}
506 
507 	return NULL;
508 }
509 
510 static const struct got_error *
511 merge_binary_file(int *overlapcnt, int merged_fd,
512     FILE *f_deriv, FILE *f_orig, FILE *f_deriv2,
513     const char *label_deriv, const char *label_orig, const char *label_deriv2,
514     const char *ondisk_path)
515 {
516 	const struct got_error *err = NULL;
517 	int same_content, changed_deriv, changed_deriv2;
518 	int fd_orig = -1, fd_deriv = -1, fd_deriv2 = -1;
519 	off_t size_orig = 0, size_deriv = 0, size_deriv2 = 0;
520 	char *path_orig = NULL, *path_deriv = NULL, *path_deriv2 = NULL;
521 	char *base_path_orig = NULL, *base_path_deriv = NULL;
522 	char *base_path_deriv2 = NULL;
523 
524 	*overlapcnt = 0;
525 
526 	err = check_files_equal(&same_content, f_deriv, f_deriv2);
527 	if (err)
528 		return err;
529 
530 	if (same_content)
531 		return copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
532 
533 	err = check_files_equal(&same_content, f_deriv, f_orig);
534 	if (err)
535 		return err;
536 	changed_deriv = !same_content;
537 	err = check_files_equal(&same_content, f_deriv2, f_orig);
538 	if (err)
539 		return err;
540 	changed_deriv2 = !same_content;
541 
542 	if (changed_deriv && changed_deriv2) {
543 		*overlapcnt = 1;
544 		if (asprintf(&base_path_orig, "%s-orig", ondisk_path) == -1) {
545 			err = got_error_from_errno("asprintf");
546 			goto done;
547 		}
548 		if (asprintf(&base_path_deriv, "%s-1", ondisk_path) == -1) {
549 			err = got_error_from_errno("asprintf");
550 			goto done;
551 		}
552 		if (asprintf(&base_path_deriv2, "%s-2", ondisk_path) == -1) {
553 			err = got_error_from_errno("asprintf");
554 			goto done;
555 		}
556 		err = got_opentemp_named_fd(&path_orig, &fd_orig,
557 		    base_path_orig, "");
558 		if (err)
559 			goto done;
560 		err = got_opentemp_named_fd(&path_deriv, &fd_deriv,
561 		    base_path_deriv, "");
562 		if (err)
563 			goto done;
564 		err = got_opentemp_named_fd(&path_deriv2, &fd_deriv2,
565 		    base_path_deriv2, "");
566 		if (err)
567 			goto done;
568 		err = copy_file_to_fd(&size_orig, f_orig, fd_orig);
569 		if (err)
570 			goto done;
571 		err = copy_file_to_fd(&size_deriv, f_deriv, fd_deriv);
572 		if (err)
573 			goto done;
574 		err = copy_file_to_fd(&size_deriv2, f_deriv2, fd_deriv2);
575 		if (err)
576 			goto done;
577 		if (dprintf(merged_fd, "Binary files differ and cannot be "
578 		    "merged automatically:\n") < 0) {
579 			err = got_error_from_errno("dprintf");
580 			goto done;
581 		}
582 		if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
583 		    GOT_DIFF_CONFLICT_MARKER_BEGIN,
584 		    label_deriv ? " " : "",
585 		    label_deriv ? label_deriv : "",
586 		    path_deriv) < 0) {
587 			err = got_error_from_errno("dprintf");
588 			goto done;
589 		}
590 		if (size_orig > 0) {
591 			if (dprintf(merged_fd, "%s%s%s\nfile %s\n",
592 			    GOT_DIFF_CONFLICT_MARKER_ORIG,
593 			    label_orig ? " " : "",
594 			    label_orig ? label_orig : "",
595 			    path_orig) < 0) {
596 				err = got_error_from_errno("dprintf");
597 				goto done;
598 			}
599 		}
600 		if (dprintf(merged_fd, "%s\nfile %s\n%s%s%s\n",
601 		    GOT_DIFF_CONFLICT_MARKER_SEP,
602 		    path_deriv2,
603 		    GOT_DIFF_CONFLICT_MARKER_END,
604 		    label_deriv2 ?  " " : "",
605 		    label_deriv2 ? label_deriv2 : "") < 0) {
606 			err = got_error_from_errno("dprintf");
607 			goto done;
608 		}
609 	} else if (changed_deriv)
610 		err = copy_file_to_fd(&size_deriv, f_deriv, merged_fd);
611 	else if (changed_deriv2)
612 		err = copy_file_to_fd(&size_deriv2, f_deriv2, merged_fd);
613 done:
614 	if (size_orig == 0 && path_orig && unlink(path_orig) == -1 &&
615 	    err == NULL)
616 		err = got_error_from_errno2("unlink", path_orig);
617 	if (fd_orig != -1 && close(fd_orig) == -1 && err == NULL)
618 		err = got_error_from_errno2("close", path_orig);
619 	if (fd_deriv != -1 && close(fd_deriv) == -1 && err == NULL)
620 		err = got_error_from_errno2("close", path_deriv);
621 	if (fd_deriv2 != -1 && close(fd_deriv2) == -1 && err == NULL)
622 		err = got_error_from_errno2("close", path_deriv2);
623 	free(path_orig);
624 	free(path_deriv);
625 	free(path_deriv2);
626 	free(base_path_orig);
627 	free(base_path_deriv);
628 	free(base_path_deriv2);
629 	return err;
630 }
631 
632 /*
633  * Perform a 3-way merge where the file f_orig acts as the common
634  * ancestor, the file f_deriv acts as the first derived version,
635  * and the file f_deriv2 acts as the second derived version.
636  * The merge result will be written to a new file at ondisk_path; any
637  * existing file at this path will be replaced.
638  */
639 static const struct got_error *
640 merge_file(int *local_changes_subsumed, struct got_worktree *worktree,
641     FILE *f_orig, FILE *f_deriv, FILE *f_deriv2, const char *ondisk_path,
642     const char *path, uint16_t st_mode,
643     const char *label_orig, const char *label_deriv, const char *label_deriv2,
644     enum got_diff_algorithm diff_algo, struct got_repository *repo,
645     got_worktree_checkout_cb progress_cb, void *progress_arg)
646 {
647 	const struct got_error *err = NULL;
648 	int merged_fd = -1;
649 	FILE *f_merged = NULL;
650 	char *merged_path = NULL, *base_path = NULL;
651 	int overlapcnt = 0;
652 	char *parent = NULL;
653 
654 	*local_changes_subsumed = 0;
655 
656 	err = got_path_dirname(&parent, ondisk_path);
657 	if (err)
658 		return err;
659 
660 	if (asprintf(&base_path, "%s/got-merged", parent) == -1) {
661 		err = got_error_from_errno("asprintf");
662 		goto done;
663 	}
664 
665 	err = got_opentemp_named_fd(&merged_path, &merged_fd, base_path, "");
666 	if (err)
667 		goto done;
668 
669 	err = got_merge_diff3(&overlapcnt, merged_fd, f_deriv, f_orig,
670 	    f_deriv2, label_deriv, label_orig, label_deriv2, diff_algo);
671 	if (err) {
672 		if (err->code != GOT_ERR_FILE_BINARY)
673 			goto done;
674 		err = merge_binary_file(&overlapcnt, merged_fd, f_deriv,
675 		    f_orig, f_deriv2, label_deriv, label_orig, label_deriv2,
676 		    ondisk_path);
677 		if (err)
678 			goto done;
679 	}
680 
681 	err = (*progress_cb)(progress_arg,
682 	    overlapcnt > 0 ? GOT_STATUS_CONFLICT : GOT_STATUS_MERGE, path);
683 	if (err)
684 		goto done;
685 
686 	if (fsync(merged_fd) != 0) {
687 		err = got_error_from_errno("fsync");
688 		goto done;
689 	}
690 
691 	f_merged = fdopen(merged_fd, "r");
692 	if (f_merged == NULL) {
693 		err = got_error_from_errno("fdopen");
694 		goto done;
695 	}
696 	merged_fd = -1;
697 
698 	/* Check if a clean merge has subsumed all local changes. */
699 	if (overlapcnt == 0) {
700 		err = check_files_equal(local_changes_subsumed, f_deriv,
701 		    f_merged);
702 		if (err)
703 			goto done;
704 	}
705 
706 	if (fchmod(fileno(f_merged), apply_umask(st_mode)) != 0) {
707 		err = got_error_from_errno2("fchmod", merged_path);
708 		goto done;
709 	}
710 
711 	if (rename(merged_path, ondisk_path) != 0) {
712 		err = got_error_from_errno3("rename", merged_path,
713 		    ondisk_path);
714 		goto done;
715 	}
716 done:
717 	if (err) {
718 		if (merged_path)
719 			unlink(merged_path);
720 	}
721 	if (merged_fd != -1 && close(merged_fd) == -1 && err == NULL)
722 		err = got_error_from_errno("close");
723 	if (f_merged && fclose(f_merged) == EOF && err == NULL)
724 		err = got_error_from_errno("fclose");
725 	free(merged_path);
726 	free(base_path);
727 	free(parent);
728 	return err;
729 }
730 
731 static const struct got_error *
732 update_symlink(const char *ondisk_path, const char *target_path,
733     size_t target_len)
734 {
735 	/* This is not atomic but matches what 'ln -sf' does. */
736 	if (unlink(ondisk_path) == -1)
737 		return got_error_from_errno2("unlink", ondisk_path);
738 	if (symlink(target_path, ondisk_path) == -1)
739 		return got_error_from_errno3("symlink", target_path,
740 		    ondisk_path);
741 	return NULL;
742 }
743 
744 /*
745  * Overwrite a symlink (or a regular file in case there was a "bad" symlink)
746  * in the work tree with a file that contains conflict markers and the
747  * conflicting target paths of the original version, a "derived version"
748  * of a symlink from an incoming change, and a local version of the symlink.
749  *
750  * The original versions's target path can be NULL if it is not available,
751  * such as if both derived versions added a new symlink at the same path.
752  *
753  * The incoming derived symlink target is NULL in case the incoming change
754  * has deleted this symlink.
755  */
756 static const struct got_error *
757 install_symlink_conflict(const char *deriv_target,
758     struct got_object_id *deriv_base_commit_id, const char *orig_target,
759     const char *label_orig, const char *local_target, const char *ondisk_path)
760 {
761 	const struct got_error *err;
762 	char *id_str = NULL, *label_deriv = NULL, *path = NULL;
763 	FILE *f = NULL;
764 
765 	err = got_object_id_str(&id_str, deriv_base_commit_id);
766 	if (err)
767 		return got_error_from_errno("asprintf");
768 
769 	if (asprintf(&label_deriv, "%s: commit %s",
770 	    GOT_MERGE_LABEL_MERGED, id_str) == -1) {
771 		err = got_error_from_errno("asprintf");
772 		goto done;
773 	}
774 
775 	err = got_opentemp_named(&path, &f, "got-symlink-conflict", "");
776 	if (err)
777 		goto done;
778 
779 	if (fchmod(fileno(f), apply_umask(GOT_DEFAULT_FILE_MODE)) == -1) {
780 		err = got_error_from_errno2("fchmod", path);
781 		goto done;
782 	}
783 
784 	if (fprintf(f, "%s %s\n%s\n%s%s%s%s%s\n%s\n%s\n",
785 	    GOT_DIFF_CONFLICT_MARKER_BEGIN, label_deriv,
786 	    deriv_target ? deriv_target : "(symlink was deleted)",
787 	    orig_target ? label_orig : "",
788 	    orig_target ? "\n" : "",
789 	    orig_target ? orig_target : "",
790 	    orig_target ? "\n" : "",
791 	    GOT_DIFF_CONFLICT_MARKER_SEP,
792 	    local_target, GOT_DIFF_CONFLICT_MARKER_END) < 0) {
793 		err = got_error_from_errno2("fprintf", path);
794 		goto done;
795 	}
796 
797 	if (unlink(ondisk_path) == -1) {
798 		err = got_error_from_errno2("unlink", ondisk_path);
799 		goto done;
800 	}
801 	if (rename(path, ondisk_path) == -1) {
802 		err = got_error_from_errno3("rename", path, ondisk_path);
803 		goto done;
804 	}
805 done:
806 	if (f != NULL && fclose(f) == EOF && err == NULL)
807 		err = got_error_from_errno2("fclose", path);
808 	free(path);
809 	free(id_str);
810 	free(label_deriv);
811 	return err;
812 }
813 
814 /* forward declaration */
815 static const struct got_error *
816 merge_blob(int *, struct got_worktree *, struct got_blob_object *,
817     const char *, const char *, uint16_t, const char *,
818     struct got_blob_object *, struct got_object_id *,
819     struct got_repository *, got_worktree_checkout_cb, void *);
820 
821 /*
822  * Merge a symlink into the work tree, where blob_orig acts as the common
823  * ancestor, deriv_target is the link target of the first derived version,
824  * and the symlink on disk acts as the second derived version.
825  * Assume that contents of both blobs represent symlinks.
826  */
827 static const struct got_error *
828 merge_symlink(struct got_worktree *worktree,
829     struct got_blob_object *blob_orig, const char *ondisk_path,
830     const char *path, const char *label_orig, const char *deriv_target,
831     struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
832     got_worktree_checkout_cb progress_cb, void *progress_arg)
833 {
834 	const struct got_error *err = NULL;
835 	char *ancestor_target = NULL;
836 	struct stat sb;
837 	ssize_t ondisk_len, deriv_len;
838 	char ondisk_target[PATH_MAX];
839 	int have_local_change = 0;
840 	int have_incoming_change = 0;
841 
842 	if (lstat(ondisk_path, &sb) == -1)
843 		return got_error_from_errno2("lstat", ondisk_path);
844 
845 	ondisk_len = readlink(ondisk_path, ondisk_target,
846 	    sizeof(ondisk_target));
847 	if (ondisk_len == -1) {
848 		err = got_error_from_errno2("readlink",
849 		    ondisk_path);
850 		goto done;
851 	}
852 	ondisk_target[ondisk_len] = '\0';
853 
854 	if (blob_orig) {
855 		err = got_object_blob_read_to_str(&ancestor_target, blob_orig);
856 		if (err)
857 			goto done;
858 	}
859 
860 	if (ancestor_target == NULL ||
861 	    (ondisk_len != strlen(ancestor_target) ||
862 	    memcmp(ondisk_target, ancestor_target, ondisk_len) != 0))
863 		have_local_change = 1;
864 
865 	deriv_len = strlen(deriv_target);
866 	if (ancestor_target == NULL ||
867 	    (deriv_len != strlen(ancestor_target) ||
868 	    memcmp(deriv_target, ancestor_target, deriv_len) != 0))
869 		have_incoming_change = 1;
870 
871 	if (!have_local_change && !have_incoming_change) {
872 		if (ancestor_target) {
873 			/* Both sides made the same change. */
874 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
875 			    path);
876 		} else if (deriv_len == ondisk_len &&
877 		    memcmp(ondisk_target, deriv_target, deriv_len) == 0) {
878 			/* Both sides added the same symlink. */
879 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
880 			    path);
881 		} else {
882 			/* Both sides added symlinks which don't match. */
883 			err = install_symlink_conflict(deriv_target,
884 			    deriv_base_commit_id, ancestor_target,
885 			    label_orig, ondisk_target, ondisk_path);
886 			if (err)
887 				goto done;
888 			err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
889 			    path);
890 		}
891 	} else if (!have_local_change && have_incoming_change) {
892 		/* Apply the incoming change. */
893 		err = update_symlink(ondisk_path, deriv_target,
894 		    strlen(deriv_target));
895 		if (err)
896 			goto done;
897 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
898 	} else if (have_local_change && have_incoming_change) {
899 		if (deriv_len == ondisk_len &&
900 		    memcmp(deriv_target, ondisk_target, deriv_len) == 0) {
901 			/* Both sides made the same change. */
902 			err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE,
903 			    path);
904 		} else {
905 			err = install_symlink_conflict(deriv_target,
906 			    deriv_base_commit_id, ancestor_target, label_orig,
907 			    ondisk_target, ondisk_path);
908 			if (err)
909 				goto done;
910 			err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
911 			    path);
912 		}
913 	}
914 
915 done:
916 	free(ancestor_target);
917 	return err;
918 }
919 
920 static const struct got_error *
921 dump_symlink_target_path_to_file(FILE **outfile, const char *ondisk_path)
922 {
923 	const struct got_error *err = NULL;
924 	char target_path[PATH_MAX];
925 	ssize_t target_len;
926 	size_t n;
927 	FILE *f;
928 
929 	*outfile = NULL;
930 
931 	f = got_opentemp();
932 	if (f == NULL)
933 		return got_error_from_errno("got_opentemp");
934 	target_len = readlink(ondisk_path, target_path, sizeof(target_path));
935 	if (target_len == -1) {
936 		err = got_error_from_errno2("readlink", ondisk_path);
937 		goto done;
938 	}
939 	n = fwrite(target_path, 1, target_len, f);
940 	if (n != target_len) {
941 		err = got_ferror(f, GOT_ERR_IO);
942 		goto done;
943 	}
944 	if (fflush(f) == EOF) {
945 		err = got_error_from_errno("fflush");
946 		goto done;
947 	}
948 	if (fseek(f, 0L, SEEK_SET) == -1) {
949 		err = got_ferror(f, GOT_ERR_IO);
950 		goto done;
951 	}
952 done:
953 	if (err)
954 		fclose(f);
955 	else
956 		*outfile = f;
957 	return err;
958 }
959 
960 /*
961  * Perform a 3-way merge where blob_orig acts as the common ancestor,
962  * blob_deriv acts as the first derived version, and the file on disk
963  * acts as the second derived version.
964  */
965 static const struct got_error *
966 merge_blob(int *local_changes_subsumed, struct got_worktree *worktree,
967     struct got_blob_object *blob_orig, const char *ondisk_path,
968     const char *path, uint16_t st_mode, const char *label_orig,
969     struct got_blob_object *blob_deriv,
970     struct got_object_id *deriv_base_commit_id, struct got_repository *repo,
971     got_worktree_checkout_cb progress_cb, void *progress_arg)
972 {
973 	const struct got_error *err = NULL;
974 	FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
975 	char *blob_orig_path = NULL;
976 	char *blob_deriv_path = NULL, *base_path = NULL, *id_str = NULL;
977 	char *label_deriv = NULL, *parent = NULL;
978 
979 	*local_changes_subsumed = 0;
980 
981 	err = got_path_dirname(&parent, ondisk_path);
982 	if (err)
983 		return err;
984 
985 	if (blob_orig) {
986 		if (asprintf(&base_path, "%s/got-merge-blob-orig",
987 		    parent) == -1) {
988 			err = got_error_from_errno("asprintf");
989 			base_path = NULL;
990 			goto done;
991 		}
992 
993 		err = got_opentemp_named(&blob_orig_path, &f_orig,
994 		    base_path, "");
995 		if (err)
996 			goto done;
997 		err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_orig,
998 		    blob_orig);
999 		if (err)
1000 			goto done;
1001 		free(base_path);
1002 	} else {
1003 		/*
1004 		 * No common ancestor exists. This is an "add vs add" conflict
1005 		 * and we simply use an empty ancestor file to make both files
1006 		 * appear in the merged result in their entirety.
1007 		 */
1008 		f_orig = got_opentemp();
1009 		if (f_orig == NULL) {
1010 			err = got_error_from_errno("got_opentemp");
1011 			goto done;
1012 		}
1013 	}
1014 
1015 	if (asprintf(&base_path, "%s/got-merge-blob-deriv", parent) == -1) {
1016 		err = got_error_from_errno("asprintf");
1017 		base_path = NULL;
1018 		goto done;
1019 	}
1020 
1021 	err = got_opentemp_named(&blob_deriv_path, &f_deriv, base_path, "");
1022 	if (err)
1023 		goto done;
1024 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_deriv,
1025 	    blob_deriv);
1026 	if (err)
1027 		goto done;
1028 
1029 	err = got_object_id_str(&id_str, deriv_base_commit_id);
1030 	if (err)
1031 		goto done;
1032 	if (asprintf(&label_deriv, "%s: commit %s",
1033 	    GOT_MERGE_LABEL_MERGED, id_str) == -1) {
1034 		err = got_error_from_errno("asprintf");
1035 		goto done;
1036 	}
1037 
1038 	/*
1039 	 * In order the run a 3-way merge with a symlink we copy the symlink's
1040 	 * target path into a temporary file and use that file with diff3.
1041 	 */
1042 	if (S_ISLNK(st_mode)) {
1043 		err = dump_symlink_target_path_to_file(&f_deriv2, ondisk_path);
1044 		if (err)
1045 			goto done;
1046 	} else {
1047 		int fd;
1048 		fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1049 		if (fd == -1) {
1050 			err = got_error_from_errno2("open", ondisk_path);
1051 			goto done;
1052 		}
1053 		f_deriv2 = fdopen(fd, "r");
1054 		if (f_deriv2 == NULL) {
1055 			err = got_error_from_errno2("fdopen", ondisk_path);
1056 			close(fd);
1057 			goto done;
1058 		}
1059 	}
1060 
1061 	err = merge_file(local_changes_subsumed, worktree, f_orig, f_deriv,
1062 	    f_deriv2, ondisk_path, path, st_mode, label_orig, label_deriv,
1063 	    NULL, GOT_DIFF_ALGORITHM_MYERS, repo, progress_cb, progress_arg);
1064 done:
1065 	if (f_orig && fclose(f_orig) == EOF && err == NULL)
1066 		err = got_error_from_errno("fclose");
1067 	if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
1068 		err = got_error_from_errno("fclose");
1069 	if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
1070 		err = got_error_from_errno("fclose");
1071 	free(base_path);
1072 	if (blob_orig_path) {
1073 		unlink(blob_orig_path);
1074 		free(blob_orig_path);
1075 	}
1076 	if (blob_deriv_path) {
1077 		unlink(blob_deriv_path);
1078 		free(blob_deriv_path);
1079 	}
1080 	free(id_str);
1081 	free(label_deriv);
1082 	free(parent);
1083 	return err;
1084 }
1085 
1086 static const struct got_error *
1087 create_fileindex_entry(struct got_fileindex_entry **new_iep,
1088     struct got_fileindex *fileindex, struct got_object_id *base_commit_id,
1089     int wt_fd, const char *path, struct got_object_id *blob_id)
1090 {
1091 	const struct got_error *err = NULL;
1092 	struct got_fileindex_entry *new_ie;
1093 
1094 	*new_iep = NULL;
1095 
1096 	err = got_fileindex_entry_alloc(&new_ie, path);
1097 	if (err)
1098 		return err;
1099 
1100 	err = got_fileindex_entry_update(new_ie, wt_fd, path,
1101 	    blob_id->sha1, base_commit_id->sha1, 1);
1102 	if (err)
1103 		goto done;
1104 
1105 	err = got_fileindex_entry_add(fileindex, new_ie);
1106 done:
1107 	if (err)
1108 		got_fileindex_entry_free(new_ie);
1109 	else
1110 		*new_iep = new_ie;
1111 	return err;
1112 }
1113 
1114 static mode_t
1115 get_ondisk_perms(int executable, mode_t st_mode)
1116 {
1117 	mode_t xbits = S_IXUSR;
1118 
1119 	if (executable) {
1120 		/* Map read bits to execute bits. */
1121 		if (st_mode & S_IRGRP)
1122 			xbits |= S_IXGRP;
1123 		if (st_mode & S_IROTH)
1124 			xbits |= S_IXOTH;
1125 		return st_mode | xbits;
1126 	}
1127 
1128 	return st_mode;
1129 }
1130 
1131 static mode_t
1132 apply_umask(mode_t mode)
1133 {
1134 	mode_t um;
1135 
1136 	um = umask(000);
1137 	umask(um);
1138 	return mode & ~um;
1139 }
1140 
1141 /* forward declaration */
1142 static const struct got_error *
1143 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1144     const char *path, mode_t te_mode, mode_t st_mode,
1145     struct got_blob_object *blob, int restoring_missing_file,
1146     int reverting_versioned_file, int installing_bad_symlink,
1147     int path_is_unversioned, struct got_repository *repo,
1148     got_worktree_checkout_cb progress_cb, void *progress_arg);
1149 
1150 /*
1151  * This function assumes that the provided symlink target points at a
1152  * safe location in the work tree!
1153  */
1154 static const struct got_error *
1155 replace_existing_symlink(int *did_something, const char *ondisk_path,
1156     const char *target_path, size_t target_len)
1157 {
1158 	const struct got_error *err = NULL;
1159 	ssize_t elen;
1160 	char etarget[PATH_MAX];
1161 	int fd;
1162 
1163 	*did_something = 0;
1164 
1165 	/*
1166 	 * "Bad" symlinks (those pointing outside the work tree or into the
1167 	 * .got directory) are installed in the work tree as a regular file
1168 	 * which contains the bad symlink target path.
1169 	 * The new symlink target has already been checked for safety by our
1170 	 * caller. If we can successfully open a regular file then we simply
1171 	 * replace this file with a symlink below.
1172 	 */
1173 	fd = open(ondisk_path, O_RDWR | O_EXCL | O_NOFOLLOW | O_CLOEXEC);
1174 	if (fd == -1) {
1175 		if (!got_err_open_nofollow_on_symlink())
1176 			return got_error_from_errno2("open", ondisk_path);
1177 
1178 		/* We are updating an existing on-disk symlink. */
1179 		elen = readlink(ondisk_path, etarget, sizeof(etarget));
1180 		if (elen == -1)
1181 			return got_error_from_errno2("readlink", ondisk_path);
1182 
1183 		if (elen == target_len &&
1184 		    memcmp(etarget, target_path, target_len) == 0)
1185 			return NULL; /* nothing to do */
1186 	}
1187 
1188 	*did_something = 1;
1189 	err = update_symlink(ondisk_path, target_path, target_len);
1190 	if (fd != -1 && close(fd) == -1 && err == NULL)
1191 		err = got_error_from_errno2("close", ondisk_path);
1192 	return err;
1193 }
1194 
1195 static const struct got_error *
1196 is_bad_symlink_target(int *is_bad_symlink, const char *target_path,
1197     size_t target_len, const char *ondisk_path, const char *wtroot_path)
1198 {
1199 	const struct got_error *err = NULL;
1200 	char canonpath[PATH_MAX];
1201 	char *path_got = NULL;
1202 
1203 	*is_bad_symlink = 0;
1204 
1205 	if (target_len >= sizeof(canonpath)) {
1206 		*is_bad_symlink = 1;
1207 		return NULL;
1208 	}
1209 
1210 	/*
1211 	 * We do not use realpath(3) to resolve the symlink's target
1212 	 * path because we don't want to resolve symlinks recursively.
1213 	 * Instead we make the path absolute and then canonicalize it.
1214 	 * Relative symlink target lookup should begin at the directory
1215 	 * in which the blob object is being installed.
1216 	 */
1217 	if (!got_path_is_absolute(target_path)) {
1218 		char *abspath, *parent;
1219 		err = got_path_dirname(&parent, ondisk_path);
1220 		if (err)
1221 			return err;
1222 		if (asprintf(&abspath, "%s/%s",  parent, target_path) == -1) {
1223 			free(parent);
1224 			return got_error_from_errno("asprintf");
1225 		}
1226 		free(parent);
1227 		if (strlen(abspath) >= sizeof(canonpath)) {
1228 			err = got_error_path(abspath, GOT_ERR_BAD_PATH);
1229 			free(abspath);
1230 			return err;
1231 		}
1232 		err = got_canonpath(abspath, canonpath, sizeof(canonpath));
1233 		free(abspath);
1234 		if (err)
1235 			return err;
1236 	} else {
1237 		err = got_canonpath(target_path, canonpath, sizeof(canonpath));
1238 		if (err)
1239 			return err;
1240 	}
1241 
1242 	/* Only allow symlinks pointing at paths within the work tree. */
1243 	if (!got_path_is_child(canonpath, wtroot_path, strlen(wtroot_path))) {
1244 		*is_bad_symlink = 1;
1245 		return NULL;
1246 	}
1247 
1248 	/* Do not allow symlinks pointing into the .got directory. */
1249 	if (asprintf(&path_got, "%s/%s", wtroot_path,
1250 	    GOT_WORKTREE_GOT_DIR) == -1)
1251 		return got_error_from_errno("asprintf");
1252 	if (got_path_is_child(canonpath, path_got, strlen(path_got)))
1253 		*is_bad_symlink = 1;
1254 
1255 	free(path_got);
1256 	return NULL;
1257 }
1258 
1259 static const struct got_error *
1260 install_symlink(int *is_bad_symlink, struct got_worktree *worktree,
1261     const char *ondisk_path, const char *path, struct got_blob_object *blob,
1262     int restoring_missing_file, int reverting_versioned_file,
1263     int path_is_unversioned, int allow_bad_symlinks,
1264     struct got_repository *repo,
1265     got_worktree_checkout_cb progress_cb, void *progress_arg)
1266 {
1267 	const struct got_error *err = NULL;
1268 	char target_path[PATH_MAX];
1269 	size_t len, target_len = 0;
1270 	const uint8_t *buf = got_object_blob_get_read_buf(blob);
1271 	size_t hdrlen = got_object_blob_get_hdrlen(blob);
1272 
1273 	*is_bad_symlink = 0;
1274 
1275 	/*
1276 	 * Blob object content specifies the target path of the link.
1277 	 * If a symbolic link cannot be installed we instead create
1278 	 * a regular file which contains the link target path stored
1279 	 * in the blob object.
1280 	 */
1281 	do {
1282 		err = got_object_blob_read_block(&len, blob);
1283 		if (err)
1284 			return err;
1285 
1286 		if (len + target_len >= sizeof(target_path)) {
1287 			/* Path too long; install as a regular file. */
1288 			*is_bad_symlink = 1;
1289 			got_object_blob_rewind(blob);
1290 			return install_blob(worktree, ondisk_path, path,
1291 			    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1292 			    restoring_missing_file, reverting_versioned_file,
1293 			    1, path_is_unversioned, repo, progress_cb,
1294 			    progress_arg);
1295 		}
1296 		if (len > 0) {
1297 			/* Skip blob object header first time around. */
1298 			memcpy(target_path + target_len, buf + hdrlen,
1299 			    len - hdrlen);
1300 			target_len += len - hdrlen;
1301 			hdrlen = 0;
1302 		}
1303 	} while (len != 0);
1304 	target_path[target_len] = '\0';
1305 
1306 	err = is_bad_symlink_target(is_bad_symlink, target_path, target_len,
1307 	    ondisk_path, worktree->root_path);
1308 	if (err)
1309 		return err;
1310 
1311 	if (*is_bad_symlink && !allow_bad_symlinks) {
1312 		/* install as a regular file */
1313 		got_object_blob_rewind(blob);
1314 		err = install_blob(worktree, ondisk_path, path,
1315 		    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1316 		    restoring_missing_file, reverting_versioned_file, 1,
1317 		    path_is_unversioned, repo, progress_cb, progress_arg);
1318 		return err;
1319 	}
1320 
1321 	if (symlink(target_path, ondisk_path) == -1) {
1322 		if (errno == EEXIST) {
1323 			int symlink_replaced;
1324 			if (path_is_unversioned) {
1325 				err = (*progress_cb)(progress_arg,
1326 				    GOT_STATUS_UNVERSIONED, path);
1327 				return err;
1328 			}
1329 			err = replace_existing_symlink(&symlink_replaced,
1330 			    ondisk_path, target_path, target_len);
1331 			if (err)
1332 				return err;
1333 			if (progress_cb) {
1334 				if (symlink_replaced) {
1335 					err = (*progress_cb)(progress_arg,
1336 					    reverting_versioned_file ?
1337 					    GOT_STATUS_REVERT :
1338 					    GOT_STATUS_UPDATE, path);
1339 				} else {
1340 					err = (*progress_cb)(progress_arg,
1341 					    GOT_STATUS_EXISTS, path);
1342 				}
1343 			}
1344 			return err; /* Nothing else to do. */
1345 		}
1346 
1347 		if (errno == ENOENT) {
1348 			char *parent;
1349 			err = got_path_dirname(&parent, ondisk_path);
1350 			if (err)
1351 				return err;
1352 			err = add_dir_on_disk(worktree, parent);
1353 			free(parent);
1354 			if (err)
1355 				return err;
1356 			/*
1357 			 * Retry, and fall through to error handling
1358 			 * below if this second attempt fails.
1359 			 */
1360 			if (symlink(target_path, ondisk_path) != -1) {
1361 				err = NULL; /* success */
1362 				return err;
1363 			}
1364 		}
1365 
1366 		/* Handle errors from first or second creation attempt. */
1367 		if (errno == ENAMETOOLONG) {
1368 			/* bad target path; install as a regular file */
1369 			*is_bad_symlink = 1;
1370 			got_object_blob_rewind(blob);
1371 			err = install_blob(worktree, ondisk_path, path,
1372 			    GOT_DEFAULT_FILE_MODE, GOT_DEFAULT_FILE_MODE, blob,
1373 			    restoring_missing_file, reverting_versioned_file, 1,
1374 			    path_is_unversioned, repo,
1375 			    progress_cb, progress_arg);
1376 		} else if (errno == ENOTDIR) {
1377 			err = got_error_path(ondisk_path,
1378 			    GOT_ERR_FILE_OBSTRUCTED);
1379 		} else {
1380 			err = got_error_from_errno3("symlink",
1381 			    target_path, ondisk_path);
1382 		}
1383 	} else if (progress_cb)
1384 		err = (*progress_cb)(progress_arg, reverting_versioned_file ?
1385 		    GOT_STATUS_REVERT : GOT_STATUS_ADD, path);
1386 	return err;
1387 }
1388 
1389 static const struct got_error *
1390 install_blob(struct got_worktree *worktree, const char *ondisk_path,
1391     const char *path, mode_t te_mode, mode_t st_mode,
1392     struct got_blob_object *blob, int restoring_missing_file,
1393     int reverting_versioned_file, int installing_bad_symlink,
1394     int path_is_unversioned, struct got_repository *repo,
1395     got_worktree_checkout_cb progress_cb, void *progress_arg)
1396 {
1397 	const struct got_error *err = NULL;
1398 	int fd = -1;
1399 	size_t len, hdrlen;
1400 	int update = 0;
1401 	char *tmppath = NULL;
1402 	mode_t mode;
1403 
1404 	mode = get_ondisk_perms(te_mode & S_IXUSR, GOT_DEFAULT_FILE_MODE);
1405 	fd = open(ondisk_path, O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW |
1406 	    O_CLOEXEC, mode);
1407 	if (fd == -1) {
1408 		if (errno == ENOENT) {
1409 			char *parent;
1410 			err = got_path_dirname(&parent, path);
1411 			if (err)
1412 				return err;
1413 			err = add_dir_on_disk(worktree, parent);
1414 			free(parent);
1415 			if (err)
1416 				return err;
1417 			fd = open(ondisk_path,
1418 			    O_RDWR | O_CREAT | O_EXCL | O_NOFOLLOW | O_CLOEXEC,
1419 			    mode);
1420 			if (fd == -1)
1421 				return got_error_from_errno2("open",
1422 				    ondisk_path);
1423 		} else if (errno == EEXIST) {
1424 			if (path_is_unversioned) {
1425 				err = (*progress_cb)(progress_arg,
1426 				    GOT_STATUS_UNVERSIONED, path);
1427 				goto done;
1428 			}
1429 			if (!(S_ISLNK(st_mode) && S_ISREG(te_mode)) &&
1430 			    !S_ISREG(st_mode) && !installing_bad_symlink) {
1431 				/* TODO file is obstructed; do something */
1432 				err = got_error_path(ondisk_path,
1433 				    GOT_ERR_FILE_OBSTRUCTED);
1434 				goto done;
1435 			} else {
1436 				err = got_opentemp_named_fd(&tmppath, &fd,
1437 				    ondisk_path, "");
1438 				if (err)
1439 					goto done;
1440 				update = 1;
1441 
1442 				if (fchmod(fd, apply_umask(mode)) == -1) {
1443 					err = got_error_from_errno2("fchmod",
1444 					    tmppath);
1445 					goto done;
1446 				}
1447 			}
1448 		} else
1449 			return got_error_from_errno2("open", ondisk_path);
1450 	}
1451 
1452 	if (progress_cb) {
1453 		if (restoring_missing_file)
1454 			err = (*progress_cb)(progress_arg, GOT_STATUS_MISSING,
1455 			    path);
1456 		else if (reverting_versioned_file)
1457 			err = (*progress_cb)(progress_arg, GOT_STATUS_REVERT,
1458 			    path);
1459 		else
1460 			err = (*progress_cb)(progress_arg,
1461 			    update ? GOT_STATUS_UPDATE : GOT_STATUS_ADD, path);
1462 		if (err)
1463 			goto done;
1464 	}
1465 
1466 	hdrlen = got_object_blob_get_hdrlen(blob);
1467 	do {
1468 		const uint8_t *buf = got_object_blob_get_read_buf(blob);
1469 		err = got_object_blob_read_block(&len, blob);
1470 		if (err)
1471 			break;
1472 		if (len > 0) {
1473 			/* Skip blob object header first time around. */
1474 			ssize_t outlen = write(fd, buf + hdrlen, len - hdrlen);
1475 			if (outlen == -1) {
1476 				err = got_error_from_errno("write");
1477 				goto done;
1478 			} else if (outlen != len - hdrlen) {
1479 				err = got_error(GOT_ERR_IO);
1480 				goto done;
1481 			}
1482 			hdrlen = 0;
1483 		}
1484 	} while (len != 0);
1485 
1486 	if (fsync(fd) != 0) {
1487 		err = got_error_from_errno("fsync");
1488 		goto done;
1489 	}
1490 
1491 	if (update) {
1492 		if (S_ISLNK(st_mode) && unlink(ondisk_path) == -1) {
1493 			err = got_error_from_errno2("unlink", ondisk_path);
1494 			goto done;
1495 		}
1496 		if (rename(tmppath, ondisk_path) != 0) {
1497 			err = got_error_from_errno3("rename", tmppath,
1498 			    ondisk_path);
1499 			goto done;
1500 		}
1501 		free(tmppath);
1502 		tmppath = NULL;
1503 	}
1504 
1505 done:
1506 	if (fd != -1 && close(fd) == -1 && err == NULL)
1507 		err = got_error_from_errno("close");
1508 	if (tmppath != NULL && unlink(tmppath) == -1 && err == NULL)
1509 		err = got_error_from_errno2("unlink", tmppath);
1510 	free(tmppath);
1511 	return err;
1512 }
1513 
1514 /* Upgrade STATUS_MODIFY to STATUS_CONFLICT if a conflict marker is found. */
1515 static const struct got_error *
1516 get_modified_file_content_status(unsigned char *status, FILE *f)
1517 {
1518 	const struct got_error *err = NULL;
1519 	const char *markers[3] = {
1520 		GOT_DIFF_CONFLICT_MARKER_BEGIN,
1521 		GOT_DIFF_CONFLICT_MARKER_SEP,
1522 		GOT_DIFF_CONFLICT_MARKER_END
1523 	};
1524 	int i = 0;
1525 	char *line = NULL;
1526 	size_t linesize = 0;
1527 	ssize_t linelen;
1528 
1529 	while (*status == GOT_STATUS_MODIFY) {
1530 		linelen = getline(&line, &linesize, f);
1531 		if (linelen == -1) {
1532 			if (feof(f))
1533 				break;
1534 			err = got_ferror(f, GOT_ERR_IO);
1535 			break;
1536 		}
1537 
1538 		if (strncmp(line, markers[i], strlen(markers[i])) == 0) {
1539 			if (strcmp(markers[i], GOT_DIFF_CONFLICT_MARKER_END)
1540 			    == 0)
1541 				*status = GOT_STATUS_CONFLICT;
1542 			else
1543 				i++;
1544 		}
1545 	}
1546 	free(line);
1547 
1548 	return err;
1549 }
1550 
1551 static int
1552 xbit_differs(struct got_fileindex_entry *ie, uint16_t st_mode)
1553 {
1554 	mode_t ie_mode = got_fileindex_perms_to_st(ie);
1555 	return ((ie_mode & S_IXUSR) != (st_mode & S_IXUSR));
1556 }
1557 
1558 static int
1559 stat_info_differs(struct got_fileindex_entry *ie, struct stat *sb)
1560 {
1561 	return !(ie->ctime_sec == sb->st_ctim.tv_sec &&
1562 	    ie->ctime_nsec == sb->st_ctim.tv_nsec &&
1563 	    ie->mtime_sec == sb->st_mtim.tv_sec &&
1564 	    ie->mtime_nsec == sb->st_mtim.tv_nsec &&
1565 	    ie->size == (sb->st_size & 0xffffffff) &&
1566 	    !xbit_differs(ie, sb->st_mode));
1567 }
1568 
1569 static unsigned char
1570 get_staged_status(struct got_fileindex_entry *ie)
1571 {
1572 	switch (got_fileindex_entry_stage_get(ie)) {
1573 	case GOT_FILEIDX_STAGE_ADD:
1574 		return GOT_STATUS_ADD;
1575 	case GOT_FILEIDX_STAGE_DELETE:
1576 		return GOT_STATUS_DELETE;
1577 	case GOT_FILEIDX_STAGE_MODIFY:
1578 		return GOT_STATUS_MODIFY;
1579 	default:
1580 		return GOT_STATUS_NO_CHANGE;
1581 	}
1582 }
1583 
1584 static const struct got_error *
1585 get_symlink_modification_status(unsigned char *status,
1586     struct got_fileindex_entry *ie, const char *abspath,
1587     int dirfd, const char *de_name, struct got_blob_object *blob)
1588 {
1589 	const struct got_error *err = NULL;
1590 	char target_path[PATH_MAX];
1591 	char etarget[PATH_MAX];
1592 	ssize_t elen;
1593 	size_t len, target_len = 0;
1594 	const uint8_t *buf = got_object_blob_get_read_buf(blob);
1595 	size_t hdrlen = got_object_blob_get_hdrlen(blob);
1596 
1597 	*status = GOT_STATUS_NO_CHANGE;
1598 
1599 	/* Blob object content specifies the target path of the link. */
1600 	do {
1601 		err = got_object_blob_read_block(&len, blob);
1602 		if (err)
1603 			return err;
1604 		if (len + target_len >= sizeof(target_path)) {
1605 			/*
1606 			 * Should not happen. The blob contents were OK
1607 			 * when this symlink was installed.
1608 			 */
1609 			return got_error(GOT_ERR_NO_SPACE);
1610 		}
1611 		if (len > 0) {
1612 			/* Skip blob object header first time around. */
1613 			memcpy(target_path + target_len, buf + hdrlen,
1614 			    len - hdrlen);
1615 			target_len += len - hdrlen;
1616 			hdrlen = 0;
1617 		}
1618 	} while (len != 0);
1619 	target_path[target_len] = '\0';
1620 
1621 	if (dirfd != -1) {
1622 		elen = readlinkat(dirfd, de_name, etarget, sizeof(etarget));
1623 		if (elen == -1)
1624 			return got_error_from_errno2("readlinkat", abspath);
1625 	} else {
1626 		elen = readlink(abspath, etarget, sizeof(etarget));
1627 		if (elen == -1)
1628 			return got_error_from_errno2("readlink", abspath);
1629 	}
1630 
1631 	if (elen != target_len || memcmp(etarget, target_path, target_len) != 0)
1632 		*status = GOT_STATUS_MODIFY;
1633 
1634 	return NULL;
1635 }
1636 
1637 static const struct got_error *
1638 get_file_status(unsigned char *status, struct stat *sb,
1639     struct got_fileindex_entry *ie, const char *abspath,
1640     int dirfd, const char *de_name, struct got_repository *repo)
1641 {
1642 	const struct got_error *err = NULL;
1643 	struct got_object_id id;
1644 	size_t hdrlen;
1645 	int fd = -1, fd1 = -1;
1646 	FILE *f = NULL;
1647 	uint8_t fbuf[8192];
1648 	struct got_blob_object *blob = NULL;
1649 	size_t flen, blen;
1650 	unsigned char staged_status = get_staged_status(ie);
1651 
1652 	*status = GOT_STATUS_NO_CHANGE;
1653 	memset(sb, 0, sizeof(*sb));
1654 
1655 	/*
1656 	 * Whenever the caller provides a directory descriptor and a
1657 	 * directory entry name for the file, use them! This prevents
1658 	 * race conditions if filesystem paths change beneath our feet.
1659 	 */
1660 	if (dirfd != -1) {
1661 		if (fstatat(dirfd, de_name, sb, AT_SYMLINK_NOFOLLOW) == -1) {
1662 			if (errno == ENOENT) {
1663 				if (got_fileindex_entry_has_file_on_disk(ie))
1664 					*status = GOT_STATUS_MISSING;
1665 				else
1666 					*status = GOT_STATUS_DELETE;
1667 				goto done;
1668 			}
1669 			err = got_error_from_errno2("fstatat", abspath);
1670 			goto done;
1671 		}
1672 	} else {
1673 		fd = open(abspath, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1674 		if (fd == -1 && errno != ENOENT &&
1675 		    !got_err_open_nofollow_on_symlink())
1676 			return got_error_from_errno2("open", abspath);
1677 		else if (fd == -1 && got_err_open_nofollow_on_symlink()) {
1678 			if (lstat(abspath, sb) == -1)
1679 				return got_error_from_errno2("lstat", abspath);
1680 		} else if (fd == -1 || fstat(fd, sb) == -1) {
1681 			if (errno == ENOENT) {
1682 				if (got_fileindex_entry_has_file_on_disk(ie))
1683 					*status = GOT_STATUS_MISSING;
1684 				else
1685 					*status = GOT_STATUS_DELETE;
1686 				goto done;
1687 			}
1688 			err = got_error_from_errno2("fstat", abspath);
1689 			goto done;
1690 		}
1691 	}
1692 
1693 	if (!S_ISREG(sb->st_mode) && !S_ISLNK(sb->st_mode)) {
1694 		*status = GOT_STATUS_OBSTRUCTED;
1695 		goto done;
1696 	}
1697 
1698 	if (!got_fileindex_entry_has_file_on_disk(ie)) {
1699 		*status = GOT_STATUS_DELETE;
1700 		goto done;
1701 	} else if (!got_fileindex_entry_has_blob(ie) &&
1702 	    staged_status != GOT_STATUS_ADD) {
1703 		*status = GOT_STATUS_ADD;
1704 		goto done;
1705 	}
1706 
1707 	if (!stat_info_differs(ie, sb))
1708 		goto done;
1709 
1710 	if (S_ISLNK(sb->st_mode) &&
1711 	    got_fileindex_entry_filetype_get(ie) != GOT_FILEIDX_MODE_SYMLINK) {
1712 		*status = GOT_STATUS_MODIFY;
1713 		goto done;
1714 	}
1715 
1716 	if (staged_status == GOT_STATUS_MODIFY ||
1717 	    staged_status == GOT_STATUS_ADD)
1718 		memcpy(id.sha1, ie->staged_blob_sha1, sizeof(id.sha1));
1719 	else
1720 		memcpy(id.sha1, ie->blob_sha1, sizeof(id.sha1));
1721 
1722 	fd1 = got_opentempfd();
1723 	if (fd1 == -1) {
1724 		err = got_error_from_errno("got_opentempfd");
1725 		goto done;
1726 	}
1727 	err = got_object_open_as_blob(&blob, repo, &id, sizeof(fbuf), fd1);
1728 	if (err)
1729 		goto done;
1730 
1731 	if (S_ISLNK(sb->st_mode)) {
1732 		err = get_symlink_modification_status(status, ie,
1733 		    abspath, dirfd, de_name, blob);
1734 		goto done;
1735 	}
1736 
1737 	if (dirfd != -1) {
1738 		fd = openat(dirfd, de_name, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
1739 		if (fd == -1) {
1740 			err = got_error_from_errno2("openat", abspath);
1741 			goto done;
1742 		}
1743 	}
1744 
1745 	f = fdopen(fd, "r");
1746 	if (f == NULL) {
1747 		err = got_error_from_errno2("fdopen", abspath);
1748 		goto done;
1749 	}
1750 	fd = -1;
1751 	hdrlen = got_object_blob_get_hdrlen(blob);
1752 	for (;;) {
1753 		const uint8_t *bbuf = got_object_blob_get_read_buf(blob);
1754 		err = got_object_blob_read_block(&blen, blob);
1755 		if (err)
1756 			goto done;
1757 		/* Skip length of blob object header first time around. */
1758 		flen = fread(fbuf, 1, sizeof(fbuf) - hdrlen, f);
1759 		if (flen == 0 && ferror(f)) {
1760 			err = got_error_from_errno("fread");
1761 			goto done;
1762 		}
1763 		if (blen - hdrlen == 0) {
1764 			if (flen != 0)
1765 				*status = GOT_STATUS_MODIFY;
1766 			break;
1767 		} else if (flen == 0) {
1768 			if (blen - hdrlen != 0)
1769 				*status = GOT_STATUS_MODIFY;
1770 			break;
1771 		} else if (blen - hdrlen == flen) {
1772 			/* Skip blob object header first time around. */
1773 			if (memcmp(bbuf + hdrlen, fbuf, flen) != 0) {
1774 				*status = GOT_STATUS_MODIFY;
1775 				break;
1776 			}
1777 		} else {
1778 			*status = GOT_STATUS_MODIFY;
1779 			break;
1780 		}
1781 		hdrlen = 0;
1782 	}
1783 
1784 	if (*status == GOT_STATUS_MODIFY) {
1785 		rewind(f);
1786 		err = get_modified_file_content_status(status, f);
1787 	} else if (xbit_differs(ie, sb->st_mode))
1788 		*status = GOT_STATUS_MODE_CHANGE;
1789 done:
1790 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
1791 		err = got_error_from_errno("close");
1792 	if (blob)
1793 		got_object_blob_close(blob);
1794 	if (f != NULL && fclose(f) == EOF && err == NULL)
1795 		err = got_error_from_errno2("fclose", abspath);
1796 	if (fd != -1 && close(fd) == -1 && err == NULL)
1797 		err = got_error_from_errno2("close", abspath);
1798 	return err;
1799 }
1800 
1801 /*
1802  * Update timestamps in the file index if a file is unmodified and
1803  * we had to run a full content comparison to find out.
1804  */
1805 static const struct got_error *
1806 sync_timestamps(int wt_fd, const char *path, unsigned char status,
1807     struct got_fileindex_entry *ie, struct stat *sb)
1808 {
1809 	if (status == GOT_STATUS_NO_CHANGE && stat_info_differs(ie, sb))
1810 		return got_fileindex_entry_update(ie, wt_fd, path,
1811 		    ie->blob_sha1, ie->commit_sha1, 1);
1812 
1813 	return NULL;
1814 }
1815 
1816 static const struct got_error *
1817 update_blob(struct got_worktree *worktree,
1818     struct got_fileindex *fileindex, struct got_fileindex_entry *ie,
1819     struct got_tree_entry *te, const char *path,
1820     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
1821     void *progress_arg)
1822 {
1823 	const struct got_error *err = NULL;
1824 	struct got_blob_object *blob = NULL;
1825 	char *ondisk_path = NULL;
1826 	unsigned char status = GOT_STATUS_NO_CHANGE;
1827 	struct stat sb;
1828 	int fd1 = -1, fd2 = -1;
1829 
1830 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, path) == -1)
1831 		return got_error_from_errno("asprintf");
1832 
1833 	if (ie) {
1834 		if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE) {
1835 			err = got_error_path(ie->path, GOT_ERR_FILE_STAGED);
1836 			goto done;
1837 		}
1838 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
1839 		    repo);
1840 		if (err)
1841 			goto done;
1842 		if (status == GOT_STATUS_MISSING || status == GOT_STATUS_DELETE)
1843 			sb.st_mode = got_fileindex_perms_to_st(ie);
1844 	} else {
1845 		if (stat(ondisk_path, &sb) == -1) {
1846 			if (errno != ENOENT) {
1847 				err = got_error_from_errno2("stat",
1848 				    ondisk_path);
1849 				goto done;
1850 			}
1851 			sb.st_mode = GOT_DEFAULT_FILE_MODE;
1852 			status = GOT_STATUS_UNVERSIONED;
1853 		} else {
1854 			if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
1855 				status = GOT_STATUS_UNVERSIONED;
1856 			else
1857 				status = GOT_STATUS_OBSTRUCTED;
1858 		}
1859 	}
1860 
1861 	if (status == GOT_STATUS_OBSTRUCTED) {
1862 		if (ie)
1863 			got_fileindex_entry_mark_skipped(ie);
1864 		err = (*progress_cb)(progress_arg, status, path);
1865 		goto done;
1866 	}
1867 	if (status == GOT_STATUS_CONFLICT) {
1868 		if (ie)
1869 			got_fileindex_entry_mark_skipped(ie);
1870 		err = (*progress_cb)(progress_arg, GOT_STATUS_CANNOT_UPDATE,
1871 		    path);
1872 		goto done;
1873 	}
1874 
1875 	if (ie && status != GOT_STATUS_MISSING && S_ISREG(sb.st_mode) &&
1876 	    (S_ISLNK(te->mode) ||
1877 	    (te->mode & S_IXUSR) == (sb.st_mode & S_IXUSR))) {
1878 		/*
1879 		 * This is a regular file or an installed bad symlink.
1880 		 * If the file index indicates that this file is already
1881 		 * up-to-date with respect to the repository we can skip
1882 		 * updating contents of this file.
1883 		 */
1884 		if (got_fileindex_entry_has_commit(ie) &&
1885 		    memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
1886 		    SHA1_DIGEST_LENGTH) == 0) {
1887 			/* Same commit. */
1888 			err = sync_timestamps(worktree->root_fd,
1889 			    path, status, ie, &sb);
1890 			if (err)
1891 				goto done;
1892 			err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1893 			    path);
1894 			goto done;
1895 		}
1896 		if (got_fileindex_entry_has_blob(ie) &&
1897 		    memcmp(ie->blob_sha1, te->id.sha1,
1898 		    SHA1_DIGEST_LENGTH) == 0) {
1899 			/* Different commit but the same blob. */
1900 			err = sync_timestamps(worktree->root_fd,
1901 			    path, status, ie, &sb);
1902 			if (err)
1903 				goto done;
1904 			err = (*progress_cb)(progress_arg, GOT_STATUS_EXISTS,
1905 			    path);
1906 			goto done;
1907 		}
1908 	}
1909 
1910 	fd1 = got_opentempfd();
1911 	if (fd1 == -1) {
1912 		err = got_error_from_errno("got_opentempfd");
1913 		goto done;
1914 	}
1915 	err = got_object_open_as_blob(&blob, repo, &te->id, 8192, fd1);
1916 	if (err)
1917 		goto done;
1918 
1919 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_ADD) {
1920 		int update_timestamps;
1921 		struct got_blob_object *blob2 = NULL;
1922 		char *label_orig = NULL;
1923 		if (got_fileindex_entry_has_blob(ie)) {
1924 			fd2 = got_opentempfd();
1925 			if (fd2 == -1) {
1926 				err = got_error_from_errno("got_opentempfd");
1927 				goto done;
1928 			}
1929 			struct got_object_id id2;
1930 			memcpy(id2.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
1931 			err = got_object_open_as_blob(&blob2, repo, &id2, 8192,
1932 			    fd2);
1933 			if (err)
1934 				goto done;
1935 		}
1936 		if (got_fileindex_entry_has_commit(ie)) {
1937 			char id_str[SHA1_DIGEST_STRING_LENGTH];
1938 			if (got_sha1_digest_to_str(ie->commit_sha1, id_str,
1939 			    sizeof(id_str)) == NULL) {
1940 				err = got_error_path(id_str,
1941 				    GOT_ERR_BAD_OBJ_ID_STR);
1942 				goto done;
1943 			}
1944 			if (asprintf(&label_orig, "%s: commit %s",
1945 			    GOT_MERGE_LABEL_BASE, id_str) == -1) {
1946 				err = got_error_from_errno("asprintf");
1947 				goto done;
1948 			}
1949 		}
1950 		if (S_ISLNK(te->mode) && S_ISLNK(sb.st_mode)) {
1951 			char *link_target;
1952 			err = got_object_blob_read_to_str(&link_target, blob);
1953 			if (err)
1954 				goto done;
1955 			err = merge_symlink(worktree, blob2, ondisk_path, path,
1956 			    label_orig, link_target, worktree->base_commit_id,
1957 			    repo, progress_cb, progress_arg);
1958 			free(link_target);
1959 		} else {
1960 			err = merge_blob(&update_timestamps, worktree, blob2,
1961 			    ondisk_path, path, sb.st_mode, label_orig, blob,
1962 			    worktree->base_commit_id, repo,
1963 			    progress_cb, progress_arg);
1964 		}
1965 		free(label_orig);
1966 		if (fd2 != -1 && close(fd2) == -1 && err == NULL) {
1967 			err = got_error_from_errno("close");
1968 			goto done;
1969 		}
1970 		if (blob2)
1971 			got_object_blob_close(blob2);
1972 		if (err)
1973 			goto done;
1974 		/*
1975 		 * Do not update timestamps of files with local changes.
1976 		 * Otherwise, a future status walk would treat them as
1977 		 * unmodified files again.
1978 		 */
1979 		err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1980 		    blob->id.sha1, worktree->base_commit_id->sha1,
1981 		    update_timestamps);
1982 	} else if (status == GOT_STATUS_MODE_CHANGE) {
1983 		err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1984 		    blob->id.sha1, worktree->base_commit_id->sha1, 0);
1985 	} else if (status == GOT_STATUS_DELETE) {
1986 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, path);
1987 		if (err)
1988 			goto done;
1989 		err = got_fileindex_entry_update(ie, worktree->root_fd, path,
1990 		    blob->id.sha1, worktree->base_commit_id->sha1, 0);
1991 		if (err)
1992 			goto done;
1993 	} else {
1994 		int is_bad_symlink = 0;
1995 		if (S_ISLNK(te->mode)) {
1996 			err = install_symlink(&is_bad_symlink, worktree,
1997 			    ondisk_path, path, blob,
1998 			    status == GOT_STATUS_MISSING, 0,
1999 			    status == GOT_STATUS_UNVERSIONED, 0,
2000 			    repo, progress_cb, progress_arg);
2001 		} else {
2002 			err = install_blob(worktree, ondisk_path, path,
2003 			    te->mode, sb.st_mode, blob,
2004 			    status == GOT_STATUS_MISSING, 0, 0,
2005 			    status == GOT_STATUS_UNVERSIONED, repo,
2006 			    progress_cb, progress_arg);
2007 		}
2008 		if (err)
2009 			goto done;
2010 
2011 		if (ie) {
2012 			err = got_fileindex_entry_update(ie,
2013 			    worktree->root_fd, path, blob->id.sha1,
2014 			    worktree->base_commit_id->sha1, 1);
2015 		} else {
2016 			err = create_fileindex_entry(&ie, fileindex,
2017 			    worktree->base_commit_id, worktree->root_fd, path,
2018 			    &blob->id);
2019 		}
2020 		if (err)
2021 			goto done;
2022 
2023 		if (is_bad_symlink) {
2024 			got_fileindex_entry_filetype_set(ie,
2025 			    GOT_FILEIDX_MODE_BAD_SYMLINK);
2026 		}
2027 	}
2028 
2029 	if (fd1 != -1 && close(fd1) == -1 && err == NULL) {
2030 		err = got_error_from_errno("close");
2031 		goto done;
2032 	}
2033 	got_object_blob_close(blob);
2034 done:
2035 	free(ondisk_path);
2036 	return err;
2037 }
2038 
2039 static const struct got_error *
2040 remove_ondisk_file(const char *root_path, const char *path)
2041 {
2042 	const struct got_error *err = NULL;
2043 	char *ondisk_path = NULL, *parent = NULL;
2044 
2045 	if (asprintf(&ondisk_path, "%s/%s", root_path, path) == -1)
2046 		return got_error_from_errno("asprintf");
2047 
2048 	if (unlink(ondisk_path) == -1) {
2049 		if (errno != ENOENT)
2050 			err = got_error_from_errno2("unlink", ondisk_path);
2051 	} else {
2052 		size_t root_len = strlen(root_path);
2053 		err = got_path_dirname(&parent, ondisk_path);
2054 		if (err)
2055 			goto done;
2056 		while (got_path_cmp(parent, root_path,
2057 		    strlen(parent), root_len) != 0) {
2058 			free(ondisk_path);
2059 			ondisk_path = parent;
2060 			parent = NULL;
2061 			if (rmdir(ondisk_path) == -1) {
2062 				if (errno != ENOTEMPTY)
2063 					err = got_error_from_errno2("rmdir",
2064 					    ondisk_path);
2065 				break;
2066 			}
2067 			err = got_path_dirname(&parent, ondisk_path);
2068 			if (err)
2069 				break;
2070 		}
2071 	}
2072 done:
2073 	free(ondisk_path);
2074 	free(parent);
2075 	return err;
2076 }
2077 
2078 static const struct got_error *
2079 delete_blob(struct got_worktree *worktree, struct got_fileindex *fileindex,
2080     struct got_fileindex_entry *ie, struct got_repository *repo,
2081     got_worktree_checkout_cb progress_cb, void *progress_arg)
2082 {
2083 	const struct got_error *err = NULL;
2084 	unsigned char status;
2085 	struct stat sb;
2086 	char *ondisk_path;
2087 
2088 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
2089 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
2090 
2091 	if (asprintf(&ondisk_path, "%s/%s", worktree->root_path, ie->path)
2092 	    == -1)
2093 		return got_error_from_errno("asprintf");
2094 
2095 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, repo);
2096 	if (err)
2097 		goto done;
2098 
2099 	if (S_ISLNK(sb.st_mode) && status != GOT_STATUS_NO_CHANGE) {
2100 		char ondisk_target[PATH_MAX];
2101 		ssize_t ondisk_len = readlink(ondisk_path, ondisk_target,
2102 		    sizeof(ondisk_target));
2103 		if (ondisk_len == -1) {
2104 			err = got_error_from_errno2("readlink", ondisk_path);
2105 			goto done;
2106 		}
2107 		ondisk_target[ondisk_len] = '\0';
2108 		err = install_symlink_conflict(NULL, worktree->base_commit_id,
2109 		    NULL, NULL, /* XXX pass common ancestor info? */
2110 		    ondisk_target, ondisk_path);
2111 		if (err)
2112 			goto done;
2113 		err = (*progress_cb)(progress_arg, GOT_STATUS_CONFLICT,
2114 		    ie->path);
2115 		goto done;
2116 	}
2117 
2118 	if (status == GOT_STATUS_MODIFY || status == GOT_STATUS_CONFLICT ||
2119 	    status == GOT_STATUS_ADD) {
2120 		err = (*progress_cb)(progress_arg, GOT_STATUS_MERGE, ie->path);
2121 		if (err)
2122 			goto done;
2123 		/*
2124 		 * Preserve the working file and change the deleted blob's
2125 		 * entry into a schedule-add entry.
2126 		 */
2127 		err = got_fileindex_entry_update(ie, worktree->root_fd,
2128 		    ie->path, NULL, NULL, 0);
2129 	} else {
2130 		err = (*progress_cb)(progress_arg, GOT_STATUS_DELETE, ie->path);
2131 		if (err)
2132 			goto done;
2133 		if (status == GOT_STATUS_NO_CHANGE) {
2134 			err = remove_ondisk_file(worktree->root_path, ie->path);
2135 			if (err)
2136 				goto done;
2137 		}
2138 		got_fileindex_entry_remove(fileindex, ie);
2139 	}
2140 done:
2141 	free(ondisk_path);
2142 	return err;
2143 }
2144 
2145 struct diff_cb_arg {
2146     struct got_fileindex *fileindex;
2147     struct got_worktree *worktree;
2148     struct got_repository *repo;
2149     got_worktree_checkout_cb progress_cb;
2150     void *progress_arg;
2151     got_cancel_cb cancel_cb;
2152     void *cancel_arg;
2153 };
2154 
2155 static const struct got_error *
2156 diff_old_new(void *arg, struct got_fileindex_entry *ie,
2157     struct got_tree_entry *te, const char *parent_path)
2158 {
2159 	struct diff_cb_arg *a = arg;
2160 
2161 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2162 		return got_error(GOT_ERR_CANCELLED);
2163 
2164 	return update_blob(a->worktree, a->fileindex, ie, te,
2165 	    ie->path, a->repo, a->progress_cb, a->progress_arg);
2166 }
2167 
2168 static const struct got_error *
2169 diff_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
2170 {
2171 	struct diff_cb_arg *a = arg;
2172 
2173 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2174 		return got_error(GOT_ERR_CANCELLED);
2175 
2176 	return delete_blob(a->worktree, a->fileindex, ie,
2177 	    a->repo, a->progress_cb, a->progress_arg);
2178 }
2179 
2180 static const struct got_error *
2181 diff_new(void *arg, struct got_tree_entry *te, const char *parent_path)
2182 {
2183 	struct diff_cb_arg *a = arg;
2184 	const struct got_error *err;
2185 	char *path;
2186 
2187 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
2188 		return got_error(GOT_ERR_CANCELLED);
2189 
2190 	if (got_object_tree_entry_is_submodule(te))
2191 		return NULL;
2192 
2193 	if (asprintf(&path, "%s%s%s", parent_path,
2194 	    parent_path[0] ? "/" : "", te->name)
2195 	    == -1)
2196 		return got_error_from_errno("asprintf");
2197 
2198 	if (S_ISDIR(te->mode))
2199 		err = add_dir_on_disk(a->worktree, path);
2200 	else
2201 		err = update_blob(a->worktree, a->fileindex, NULL, te, path,
2202 		    a->repo, a->progress_cb, a->progress_arg);
2203 
2204 	free(path);
2205 	return err;
2206 }
2207 
2208 const struct got_error *
2209 got_worktree_get_uuid(char **uuidstr, struct got_worktree *worktree)
2210 {
2211 	uint32_t uuid_status;
2212 
2213 	uuid_to_string(&worktree->uuid, uuidstr, &uuid_status);
2214 	if (uuid_status != uuid_s_ok) {
2215 		*uuidstr = NULL;
2216 		return got_error_uuid(uuid_status, "uuid_to_string");
2217 	}
2218 
2219 	return NULL;
2220 }
2221 
2222 static const struct got_error *
2223 get_ref_name(char **refname, struct got_worktree *worktree, const char *prefix)
2224 {
2225 	const struct got_error *err = NULL;
2226 	char *uuidstr = NULL;
2227 
2228 	*refname = NULL;
2229 
2230 	err = got_worktree_get_uuid(&uuidstr, worktree);
2231 	if (err)
2232 		return err;
2233 
2234 	if (asprintf(refname, "%s-%s", prefix, uuidstr) == -1) {
2235 		err = got_error_from_errno("asprintf");
2236 		*refname = NULL;
2237 	}
2238 	free(uuidstr);
2239 	return err;
2240 }
2241 
2242 const struct got_error *
2243 got_worktree_get_base_ref_name(char **refname, struct got_worktree *worktree)
2244 {
2245 	return get_ref_name(refname, worktree, GOT_WORKTREE_BASE_REF_PREFIX);
2246 }
2247 
2248 static const struct got_error *
2249 get_rebase_tmp_ref_name(char **refname, struct got_worktree *worktree)
2250 {
2251 	return get_ref_name(refname, worktree,
2252 	    GOT_WORKTREE_REBASE_TMP_REF_PREFIX);
2253 }
2254 
2255 static const struct got_error *
2256 get_newbase_symref_name(char **refname, struct got_worktree *worktree)
2257 {
2258 	return get_ref_name(refname, worktree, GOT_WORKTREE_NEWBASE_REF_PREFIX);
2259 }
2260 
2261 static const struct got_error *
2262 get_rebase_branch_symref_name(char **refname, struct got_worktree *worktree)
2263 {
2264 	return get_ref_name(refname, worktree,
2265 	    GOT_WORKTREE_REBASE_BRANCH_REF_PREFIX);
2266 }
2267 
2268 static const struct got_error *
2269 get_rebase_commit_ref_name(char **refname, struct got_worktree *worktree)
2270 {
2271 	return get_ref_name(refname, worktree,
2272 	    GOT_WORKTREE_REBASE_COMMIT_REF_PREFIX);
2273 }
2274 
2275 static const struct got_error *
2276 get_histedit_tmp_ref_name(char **refname, struct got_worktree *worktree)
2277 {
2278 	return get_ref_name(refname, worktree,
2279 	    GOT_WORKTREE_HISTEDIT_TMP_REF_PREFIX);
2280 }
2281 
2282 static const struct got_error *
2283 get_histedit_branch_symref_name(char **refname, struct got_worktree *worktree)
2284 {
2285 	return get_ref_name(refname, worktree,
2286 	    GOT_WORKTREE_HISTEDIT_BRANCH_REF_PREFIX);
2287 }
2288 
2289 static const struct got_error *
2290 get_histedit_base_commit_ref_name(char **refname, struct got_worktree *worktree)
2291 {
2292 	return get_ref_name(refname, worktree,
2293 	    GOT_WORKTREE_HISTEDIT_BASE_COMMIT_REF_PREFIX);
2294 }
2295 
2296 static const struct got_error *
2297 get_histedit_commit_ref_name(char **refname, struct got_worktree *worktree)
2298 {
2299 	return get_ref_name(refname, worktree,
2300 	    GOT_WORKTREE_HISTEDIT_COMMIT_REF_PREFIX);
2301 }
2302 
2303 const struct got_error *
2304 got_worktree_get_histedit_script_path(char **path,
2305     struct got_worktree *worktree)
2306 {
2307 	if (asprintf(path, "%s/%s/%s", worktree->root_path,
2308 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_HISTEDIT_SCRIPT) == -1) {
2309 		*path = NULL;
2310 		return got_error_from_errno("asprintf");
2311 	}
2312 	return NULL;
2313 }
2314 
2315 static const struct got_error *
2316 get_merge_branch_ref_name(char **refname, struct got_worktree *worktree)
2317 {
2318 	return get_ref_name(refname, worktree,
2319 	    GOT_WORKTREE_MERGE_BRANCH_REF_PREFIX);
2320 }
2321 
2322 static const struct got_error *
2323 get_merge_commit_ref_name(char **refname, struct got_worktree *worktree)
2324 {
2325 	return get_ref_name(refname, worktree,
2326 	    GOT_WORKTREE_MERGE_COMMIT_REF_PREFIX);
2327 }
2328 
2329 /*
2330  * Prevent Git's garbage collector from deleting our base commit by
2331  * setting a reference to our base commit's ID.
2332  */
2333 static const struct got_error *
2334 ref_base_commit(struct got_worktree *worktree, struct got_repository *repo)
2335 {
2336 	const struct got_error *err = NULL;
2337 	struct got_reference *ref = NULL;
2338 	char *refname;
2339 
2340 	err = got_worktree_get_base_ref_name(&refname, worktree);
2341 	if (err)
2342 		return err;
2343 
2344 	err = got_ref_alloc(&ref, refname, worktree->base_commit_id);
2345 	if (err)
2346 		goto done;
2347 
2348 	err = got_ref_write(ref, repo);
2349 done:
2350 	free(refname);
2351 	if (ref)
2352 		got_ref_close(ref);
2353 	return err;
2354 }
2355 
2356 static const struct got_error *
2357 get_fileindex_path(char **fileindex_path, struct got_worktree *worktree)
2358 {
2359 	const struct got_error *err = NULL;
2360 
2361 	if (asprintf(fileindex_path, "%s/%s/%s", worktree->root_path,
2362 	    GOT_WORKTREE_GOT_DIR, GOT_WORKTREE_FILE_INDEX) == -1) {
2363 		err = got_error_from_errno("asprintf");
2364 		*fileindex_path = NULL;
2365 	}
2366 	return err;
2367 }
2368 
2369 
2370 static const struct got_error *
2371 open_fileindex(struct got_fileindex **fileindex, char **fileindex_path,
2372     struct got_worktree *worktree)
2373 {
2374 	const struct got_error *err = NULL;
2375 	FILE *index = NULL;
2376 
2377 	*fileindex_path = NULL;
2378 	*fileindex = got_fileindex_alloc();
2379 	if (*fileindex == NULL)
2380 		return got_error_from_errno("got_fileindex_alloc");
2381 
2382 	err = get_fileindex_path(fileindex_path, worktree);
2383 	if (err)
2384 		goto done;
2385 
2386 	index = fopen(*fileindex_path, "rbe");
2387 	if (index == NULL) {
2388 		if (errno != ENOENT)
2389 			err = got_error_from_errno2("fopen", *fileindex_path);
2390 	} else {
2391 		err = got_fileindex_read(*fileindex, index);
2392 		if (fclose(index) == EOF && err == NULL)
2393 			err = got_error_from_errno("fclose");
2394 	}
2395 done:
2396 	if (err) {
2397 		free(*fileindex_path);
2398 		*fileindex_path = NULL;
2399 		got_fileindex_free(*fileindex);
2400 		*fileindex = NULL;
2401 	}
2402 	return err;
2403 }
2404 
2405 struct bump_base_commit_id_arg {
2406 	struct got_object_id *base_commit_id;
2407 	const char *path;
2408 	size_t path_len;
2409 	const char *entry_name;
2410 	got_worktree_checkout_cb progress_cb;
2411 	void *progress_arg;
2412 };
2413 
2414 /* Bump base commit ID of all files within an updated part of the work tree. */
2415 static const struct got_error *
2416 bump_base_commit_id(void *arg, struct got_fileindex_entry *ie)
2417 {
2418 	const struct got_error *err;
2419 	struct bump_base_commit_id_arg *a = arg;
2420 
2421 	if (a->entry_name) {
2422 		if (strcmp(ie->path, a->path) != 0)
2423 			return NULL;
2424 	} else if (!got_path_is_child(ie->path, a->path, a->path_len))
2425 		return NULL;
2426 
2427 	if (got_fileindex_entry_was_skipped(ie))
2428 		return NULL;
2429 
2430 	if (memcmp(ie->commit_sha1, a->base_commit_id->sha1,
2431 	    SHA1_DIGEST_LENGTH) == 0)
2432 		return NULL;
2433 
2434 	if (a->progress_cb) {
2435 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_BUMP_BASE,
2436 		    ie->path);
2437 		if (err)
2438 			return err;
2439 	}
2440 	memcpy(ie->commit_sha1, a->base_commit_id->sha1, SHA1_DIGEST_LENGTH);
2441 	return NULL;
2442 }
2443 
2444 static const struct got_error *
2445 bump_base_commit_id_everywhere(struct got_worktree *worktree,
2446     struct got_fileindex *fileindex,
2447     got_worktree_checkout_cb progress_cb, void *progress_arg)
2448 {
2449 	struct bump_base_commit_id_arg bbc_arg;
2450 
2451 	bbc_arg.base_commit_id = worktree->base_commit_id;
2452 	bbc_arg.entry_name = NULL;
2453 	bbc_arg.path = "";
2454 	bbc_arg.path_len = 0;
2455 	bbc_arg.progress_cb = progress_cb;
2456 	bbc_arg.progress_arg = progress_arg;
2457 
2458 	return got_fileindex_for_each_entry_safe(fileindex,
2459 	    bump_base_commit_id, &bbc_arg);
2460 }
2461 
2462 static const struct got_error *
2463 sync_fileindex(struct got_fileindex *fileindex, const char *fileindex_path)
2464 {
2465 	const struct got_error *err = NULL;
2466 	char *new_fileindex_path = NULL;
2467 	FILE *new_index = NULL;
2468 	struct timespec timeout;
2469 
2470 	err = got_opentemp_named(&new_fileindex_path, &new_index,
2471 	    fileindex_path, "");
2472 	if (err)
2473 		goto done;
2474 
2475 	err = got_fileindex_write(fileindex, new_index);
2476 	if (err)
2477 		goto done;
2478 
2479 	if (rename(new_fileindex_path, fileindex_path) != 0) {
2480 		err = got_error_from_errno3("rename", new_fileindex_path,
2481 		    fileindex_path);
2482 		unlink(new_fileindex_path);
2483 	}
2484 
2485 	/*
2486 	 * Sleep for a short amount of time to ensure that files modified after
2487 	 * this program exits have a different time stamp from the one which
2488 	 * was recorded in the file index.
2489 	 */
2490 	timeout.tv_sec = 0;
2491 	timeout.tv_nsec = 1;
2492 	nanosleep(&timeout,  NULL);
2493 done:
2494 	if (new_index)
2495 		fclose(new_index);
2496 	free(new_fileindex_path);
2497 	return err;
2498 }
2499 
2500 static const struct got_error *
2501 find_tree_entry_for_checkout(int *entry_type, char **tree_relpath,
2502     struct got_object_id **tree_id, const char *wt_relpath,
2503     struct got_commit_object *base_commit, struct got_worktree *worktree,
2504     struct got_repository *repo)
2505 {
2506 	const struct got_error *err = NULL;
2507 	struct got_object_id *id = NULL;
2508 	char *in_repo_path = NULL;
2509 	int is_root_wt = got_path_is_root_dir(worktree->path_prefix);
2510 
2511 	*entry_type = GOT_OBJ_TYPE_ANY;
2512 	*tree_relpath = NULL;
2513 	*tree_id = NULL;
2514 
2515 	if (wt_relpath[0] == '\0') {
2516 		/* Check out all files within the work tree. */
2517 		*entry_type = GOT_OBJ_TYPE_TREE;
2518 		*tree_relpath = strdup("");
2519 		if (*tree_relpath == NULL) {
2520 			err = got_error_from_errno("strdup");
2521 			goto done;
2522 		}
2523 		err = got_object_id_by_path(tree_id, repo, base_commit,
2524 		    worktree->path_prefix);
2525 		if (err)
2526 			goto done;
2527 		return NULL;
2528 	}
2529 
2530 	/* Check out a subset of files in the work tree. */
2531 
2532 	if (asprintf(&in_repo_path, "%s%s%s", worktree->path_prefix,
2533 	    is_root_wt ? "" : "/", wt_relpath) == -1) {
2534 		err = got_error_from_errno("asprintf");
2535 		goto done;
2536 	}
2537 
2538 	err = got_object_id_by_path(&id, repo, base_commit, in_repo_path);
2539 	if (err)
2540 		goto done;
2541 
2542 	free(in_repo_path);
2543 	in_repo_path = NULL;
2544 
2545 	err = got_object_get_type(entry_type, repo, id);
2546 	if (err)
2547 		goto done;
2548 
2549 	if (*entry_type == GOT_OBJ_TYPE_BLOB) {
2550 		/* Check out a single file. */
2551 		if (strchr(wt_relpath, '/')  == NULL) {
2552 			/* Check out a single file in work tree's root dir. */
2553 			in_repo_path = strdup(worktree->path_prefix);
2554 			if (in_repo_path == NULL) {
2555 				err = got_error_from_errno("strdup");
2556 				goto done;
2557 			}
2558 			*tree_relpath = strdup("");
2559 			if (*tree_relpath == NULL) {
2560 				err = got_error_from_errno("strdup");
2561 				goto done;
2562 			}
2563 		} else {
2564 			/* Check out a single file in a subdirectory. */
2565 			err = got_path_dirname(tree_relpath, wt_relpath);
2566 			if (err)
2567 				return err;
2568 			if (asprintf(&in_repo_path, "%s%s%s",
2569 			    worktree->path_prefix, is_root_wt ? "" : "/",
2570 			    *tree_relpath) == -1) {
2571 				err = got_error_from_errno("asprintf");
2572 				goto done;
2573 			}
2574 		}
2575 		err = got_object_id_by_path(tree_id, repo,
2576 		    base_commit, in_repo_path);
2577 	} else {
2578 		/* Check out all files within a subdirectory. */
2579 		*tree_id = got_object_id_dup(id);
2580 		if (*tree_id == NULL) {
2581 			err = got_error_from_errno("got_object_id_dup");
2582 			goto done;
2583 		}
2584 		*tree_relpath = strdup(wt_relpath);
2585 		if (*tree_relpath == NULL) {
2586 			err = got_error_from_errno("strdup");
2587 			goto done;
2588 		}
2589 	}
2590 done:
2591 	free(id);
2592 	free(in_repo_path);
2593 	if (err) {
2594 		*entry_type = GOT_OBJ_TYPE_ANY;
2595 		free(*tree_relpath);
2596 		*tree_relpath = NULL;
2597 		free(*tree_id);
2598 		*tree_id = NULL;
2599 	}
2600 	return err;
2601 }
2602 
2603 static const struct got_error *
2604 checkout_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
2605     const char *relpath, struct got_object_id *tree_id, const char *entry_name,
2606     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
2607     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
2608 {
2609 	const struct got_error *err = NULL;
2610 	struct got_commit_object *commit = NULL;
2611 	struct got_tree_object *tree = NULL;
2612 	struct got_fileindex_diff_tree_cb diff_cb;
2613 	struct diff_cb_arg arg;
2614 
2615 	err = ref_base_commit(worktree, repo);
2616 	if (err) {
2617 		if (!(err->code == GOT_ERR_ERRNO &&
2618 		    (errno == EACCES || errno == EROFS)))
2619 			goto done;
2620 		err = (*progress_cb)(progress_arg,
2621 		    GOT_STATUS_BASE_REF_ERR, worktree->root_path);
2622 		if (err)
2623 			return err;
2624 	}
2625 
2626 	err = got_object_open_as_commit(&commit, repo,
2627 	    worktree->base_commit_id);
2628 	if (err)
2629 		goto done;
2630 
2631 	err = got_object_open_as_tree(&tree, repo, tree_id);
2632 	if (err)
2633 		goto done;
2634 
2635 	if (entry_name &&
2636 	    got_object_tree_find_entry(tree, entry_name) == NULL) {
2637 		err = got_error_path(entry_name, GOT_ERR_NO_TREE_ENTRY);
2638 		goto done;
2639 	}
2640 
2641 	diff_cb.diff_old_new = diff_old_new;
2642 	diff_cb.diff_old = diff_old;
2643 	diff_cb.diff_new = diff_new;
2644 	arg.fileindex = fileindex;
2645 	arg.worktree = worktree;
2646 	arg.repo = repo;
2647 	arg.progress_cb = progress_cb;
2648 	arg.progress_arg = progress_arg;
2649 	arg.cancel_cb = cancel_cb;
2650 	arg.cancel_arg = cancel_arg;
2651 	err = got_fileindex_diff_tree(fileindex, tree, relpath,
2652 	    entry_name, repo, &diff_cb, &arg);
2653 done:
2654 	if (tree)
2655 		got_object_tree_close(tree);
2656 	if (commit)
2657 		got_object_commit_close(commit);
2658 	return err;
2659 }
2660 
2661 const struct got_error *
2662 got_worktree_checkout_files(struct got_worktree *worktree,
2663     struct got_pathlist_head *paths, struct got_repository *repo,
2664     got_worktree_checkout_cb progress_cb, void *progress_arg,
2665     got_cancel_cb cancel_cb, void *cancel_arg)
2666 {
2667 	const struct got_error *err = NULL, *sync_err, *unlockerr;
2668 	struct got_commit_object *commit = NULL;
2669 	struct got_tree_object *tree = NULL;
2670 	struct got_fileindex *fileindex = NULL;
2671 	char *fileindex_path = NULL;
2672 	struct got_pathlist_entry *pe;
2673 	struct tree_path_data {
2674 		STAILQ_ENTRY(tree_path_data) entry;
2675 		struct got_object_id *tree_id;
2676 		int entry_type;
2677 		char *relpath;
2678 		char *entry_name;
2679 	} *tpd = NULL;
2680 	STAILQ_HEAD(tree_paths, tree_path_data) tree_paths;
2681 
2682 	STAILQ_INIT(&tree_paths);
2683 
2684 	err = lock_worktree(worktree, LOCK_EX);
2685 	if (err)
2686 		return err;
2687 
2688 	err = got_object_open_as_commit(&commit, repo,
2689 	    worktree->base_commit_id);
2690 	if (err)
2691 		goto done;
2692 
2693 	/* Map all specified paths to in-repository trees. */
2694 	TAILQ_FOREACH(pe, paths, entry) {
2695 		tpd = malloc(sizeof(*tpd));
2696 		if (tpd == NULL) {
2697 			err = got_error_from_errno("malloc");
2698 			goto done;
2699 		}
2700 
2701 		err = find_tree_entry_for_checkout(&tpd->entry_type,
2702 		    &tpd->relpath, &tpd->tree_id, pe->path, commit,
2703 		    worktree, repo);
2704 		if (err) {
2705 			free(tpd);
2706 			goto done;
2707 		}
2708 
2709 		if (tpd->entry_type == GOT_OBJ_TYPE_BLOB) {
2710 			err = got_path_basename(&tpd->entry_name, pe->path);
2711 			if (err) {
2712 				free(tpd->relpath);
2713 				free(tpd->tree_id);
2714 				free(tpd);
2715 				goto done;
2716 			}
2717 		} else
2718 			tpd->entry_name = NULL;
2719 
2720 		STAILQ_INSERT_TAIL(&tree_paths, tpd, entry);
2721 	}
2722 
2723 	/*
2724 	 * Read the file index.
2725 	 * Checking out files is supposed to be an idempotent operation.
2726 	 * If the on-disk file index is incomplete we will try to complete it.
2727 	 */
2728 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
2729 	if (err)
2730 		goto done;
2731 
2732 	tpd = STAILQ_FIRST(&tree_paths);
2733 	TAILQ_FOREACH(pe, paths, entry) {
2734 		struct bump_base_commit_id_arg bbc_arg;
2735 
2736 		err = checkout_files(worktree, fileindex, tpd->relpath,
2737 		    tpd->tree_id, tpd->entry_name, repo,
2738 		    progress_cb, progress_arg, cancel_cb, cancel_arg);
2739 		if (err)
2740 			break;
2741 
2742 		bbc_arg.base_commit_id = worktree->base_commit_id;
2743 		bbc_arg.entry_name = tpd->entry_name;
2744 		bbc_arg.path = pe->path;
2745 		bbc_arg.path_len = pe->path_len;
2746 		bbc_arg.progress_cb = progress_cb;
2747 		bbc_arg.progress_arg = progress_arg;
2748 		err = got_fileindex_for_each_entry_safe(fileindex,
2749 		    bump_base_commit_id, &bbc_arg);
2750 		if (err)
2751 			break;
2752 
2753 		tpd = STAILQ_NEXT(tpd, entry);
2754 	}
2755 	sync_err = sync_fileindex(fileindex, fileindex_path);
2756 	if (sync_err && err == NULL)
2757 		err = sync_err;
2758 done:
2759 	free(fileindex_path);
2760 	if (tree)
2761 		got_object_tree_close(tree);
2762 	if (commit)
2763 		got_object_commit_close(commit);
2764 	if (fileindex)
2765 		got_fileindex_free(fileindex);
2766 	while (!STAILQ_EMPTY(&tree_paths)) {
2767 		tpd = STAILQ_FIRST(&tree_paths);
2768 		STAILQ_REMOVE_HEAD(&tree_paths, entry);
2769 		free(tpd->relpath);
2770 		free(tpd->tree_id);
2771 		free(tpd);
2772 	}
2773 	unlockerr = lock_worktree(worktree, LOCK_SH);
2774 	if (unlockerr && err == NULL)
2775 		err = unlockerr;
2776 	return err;
2777 }
2778 
2779 struct merge_file_cb_arg {
2780     struct got_worktree *worktree;
2781     struct got_fileindex *fileindex;
2782     got_worktree_checkout_cb progress_cb;
2783     void *progress_arg;
2784     got_cancel_cb cancel_cb;
2785     void *cancel_arg;
2786     const char *label_orig;
2787     struct got_object_id *commit_id2;
2788     int allow_bad_symlinks;
2789 };
2790 
2791 static const struct got_error *
2792 merge_file_cb(void *arg, struct got_blob_object *blob1,
2793     struct got_blob_object *blob2, FILE *f1, FILE *f2,
2794     struct got_object_id *id1, struct got_object_id *id2,
2795     const char *path1, const char *path2,
2796     mode_t mode1, mode_t mode2, struct got_repository *repo)
2797 {
2798 	static const struct got_error *err = NULL;
2799 	struct merge_file_cb_arg *a = arg;
2800 	struct got_fileindex_entry *ie;
2801 	char *ondisk_path = NULL;
2802 	struct stat sb;
2803 	unsigned char status;
2804 	int local_changes_subsumed;
2805 	FILE *f_orig = NULL, *f_deriv = NULL, *f_deriv2 = NULL;
2806 	char *id_str = NULL, *label_deriv2 = NULL;
2807 
2808 	if (blob1 && blob2) {
2809 		ie = got_fileindex_entry_get(a->fileindex, path2,
2810 		    strlen(path2));
2811 		if (ie == NULL)
2812 			return (*a->progress_cb)(a->progress_arg,
2813 			    GOT_STATUS_MISSING, path2);
2814 
2815 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2816 		    path2) == -1)
2817 			return got_error_from_errno("asprintf");
2818 
2819 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2820 		    repo);
2821 		if (err)
2822 			goto done;
2823 
2824 		if (status == GOT_STATUS_DELETE) {
2825 			err = (*a->progress_cb)(a->progress_arg,
2826 			    GOT_STATUS_MERGE, path2);
2827 			goto done;
2828 		}
2829 		if (status != GOT_STATUS_NO_CHANGE &&
2830 		    status != GOT_STATUS_MODIFY &&
2831 		    status != GOT_STATUS_CONFLICT &&
2832 		    status != GOT_STATUS_ADD) {
2833 			err = (*a->progress_cb)(a->progress_arg, status, path2);
2834 			goto done;
2835 		}
2836 
2837 		if (S_ISLNK(mode1) && S_ISLNK(mode2)) {
2838 			char *link_target2;
2839 			err = got_object_blob_read_to_str(&link_target2, blob2);
2840 			if (err)
2841 				goto done;
2842 			err = merge_symlink(a->worktree, blob1, ondisk_path,
2843 			    path2, a->label_orig, link_target2, a->commit_id2,
2844 			    repo, a->progress_cb, a->progress_arg);
2845 			free(link_target2);
2846 		} else {
2847 			int fd;
2848 
2849 			f_orig = got_opentemp();
2850 			if (f_orig == NULL) {
2851 				err = got_error_from_errno("got_opentemp");
2852 				goto done;
2853 			}
2854 			err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2855 			    f_orig, blob1);
2856 			if (err)
2857 				goto done;
2858 
2859 			f_deriv2 = got_opentemp();
2860 			if (f_deriv2 == NULL)
2861 				goto done;
2862 			err = got_object_blob_dump_to_file(NULL, NULL, NULL,
2863 			    f_deriv2, blob2);
2864 			if (err)
2865 				goto done;
2866 
2867 			fd = open(ondisk_path,
2868 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
2869 			if (fd == -1) {
2870 				err = got_error_from_errno2("open",
2871 				    ondisk_path);
2872 				goto done;
2873 			}
2874 			f_deriv = fdopen(fd, "r");
2875 			if (f_deriv == NULL) {
2876 				err = got_error_from_errno2("fdopen",
2877 				    ondisk_path);
2878 				close(fd);
2879 				goto done;
2880 			}
2881 			err = got_object_id_str(&id_str, a->commit_id2);
2882 			if (err)
2883 				goto done;
2884 			if (asprintf(&label_deriv2, "%s: commit %s",
2885 			    GOT_MERGE_LABEL_MERGED, id_str) == -1) {
2886 				err = got_error_from_errno("asprintf");
2887 				goto done;
2888 			}
2889 			err = merge_file(&local_changes_subsumed, a->worktree,
2890 			    f_orig, f_deriv, f_deriv2, ondisk_path, path2,
2891 			    sb.st_mode, a->label_orig, NULL, label_deriv2,
2892 			    GOT_DIFF_ALGORITHM_PATIENCE, repo,
2893 			    a->progress_cb, a->progress_arg);
2894 		}
2895 	} else if (blob1) {
2896 		ie = got_fileindex_entry_get(a->fileindex, path1,
2897 		    strlen(path1));
2898 		if (ie == NULL)
2899 			return (*a->progress_cb)(a->progress_arg,
2900 			    GOT_STATUS_MISSING, path1);
2901 
2902 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2903 		    path1) == -1)
2904 			return got_error_from_errno("asprintf");
2905 
2906 		err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL,
2907 		    repo);
2908 		if (err)
2909 			goto done;
2910 
2911 		switch (status) {
2912 		case GOT_STATUS_NO_CHANGE:
2913 			err = (*a->progress_cb)(a->progress_arg,
2914 			    GOT_STATUS_DELETE, path1);
2915 			if (err)
2916 				goto done;
2917 			err = remove_ondisk_file(a->worktree->root_path, path1);
2918 			if (err)
2919 				goto done;
2920 			if (ie)
2921 				got_fileindex_entry_mark_deleted_from_disk(ie);
2922 			break;
2923 		case GOT_STATUS_DELETE:
2924 		case GOT_STATUS_MISSING:
2925 			err = (*a->progress_cb)(a->progress_arg,
2926 			    GOT_STATUS_DELETE, path1);
2927 			if (err)
2928 				goto done;
2929 			if (ie)
2930 				got_fileindex_entry_mark_deleted_from_disk(ie);
2931 			break;
2932 		case GOT_STATUS_ADD: {
2933 			struct got_object_id *id;
2934 			FILE *blob1_f;
2935 			off_t blob1_size;
2936 			/*
2937 			 * Delete the added file only if its content already
2938 			 * exists in the repository.
2939 			 */
2940 			err = got_object_blob_file_create(&id, &blob1_f,
2941 			    &blob1_size, path1);
2942 			if (err)
2943 				goto done;
2944 			if (got_object_id_cmp(id, id1) == 0) {
2945 				err = (*a->progress_cb)(a->progress_arg,
2946 				    GOT_STATUS_DELETE, path1);
2947 				if (err)
2948 					goto done;
2949 				err = remove_ondisk_file(a->worktree->root_path,
2950 				    path1);
2951 				if (err)
2952 					goto done;
2953 				if (ie)
2954 					got_fileindex_entry_remove(a->fileindex,
2955 					    ie);
2956 			} else {
2957 				err = (*a->progress_cb)(a->progress_arg,
2958 				    GOT_STATUS_CANNOT_DELETE, path1);
2959 			}
2960 			if (fclose(blob1_f) == EOF && err == NULL)
2961 				err = got_error_from_errno("fclose");
2962 			free(id);
2963 			if (err)
2964 				goto done;
2965 			break;
2966 		}
2967 		case GOT_STATUS_MODIFY:
2968 		case GOT_STATUS_CONFLICT:
2969 			err = (*a->progress_cb)(a->progress_arg,
2970 			    GOT_STATUS_CANNOT_DELETE, path1);
2971 			if (err)
2972 				goto done;
2973 			break;
2974 		case GOT_STATUS_OBSTRUCTED:
2975 			err = (*a->progress_cb)(a->progress_arg, status, path1);
2976 			if (err)
2977 				goto done;
2978 			break;
2979 		default:
2980 			break;
2981 		}
2982 	} else if (blob2) {
2983 		if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
2984 		    path2) == -1)
2985 			return got_error_from_errno("asprintf");
2986 		ie = got_fileindex_entry_get(a->fileindex, path2,
2987 		    strlen(path2));
2988 		if (ie) {
2989 			err = get_file_status(&status, &sb, ie, ondisk_path,
2990 			    -1, NULL, repo);
2991 			if (err)
2992 				goto done;
2993 			if (status != GOT_STATUS_NO_CHANGE &&
2994 			    status != GOT_STATUS_MODIFY &&
2995 			    status != GOT_STATUS_CONFLICT &&
2996 			    status != GOT_STATUS_ADD) {
2997 				err = (*a->progress_cb)(a->progress_arg,
2998 				    status, path2);
2999 				goto done;
3000 			}
3001 			if (S_ISLNK(mode2) && S_ISLNK(sb.st_mode)) {
3002 				char *link_target2;
3003 				err = got_object_blob_read_to_str(&link_target2,
3004 				    blob2);
3005 				if (err)
3006 					goto done;
3007 				err = merge_symlink(a->worktree, NULL,
3008 				    ondisk_path, path2, a->label_orig,
3009 				    link_target2, a->commit_id2, repo,
3010 				    a->progress_cb, a->progress_arg);
3011 				free(link_target2);
3012 			} else if (S_ISREG(sb.st_mode)) {
3013 				err = merge_blob(&local_changes_subsumed,
3014 				    a->worktree, NULL, ondisk_path, path2,
3015 				    sb.st_mode, a->label_orig, blob2,
3016 				    a->commit_id2, repo, a->progress_cb,
3017 				    a->progress_arg);
3018 			} else {
3019 				err = got_error_path(ondisk_path,
3020 				    GOT_ERR_FILE_OBSTRUCTED);
3021 			}
3022 			if (err)
3023 				goto done;
3024 			if (status == GOT_STATUS_DELETE) {
3025 				err = got_fileindex_entry_update(ie,
3026 				    a->worktree->root_fd, path2, blob2->id.sha1,
3027 				    a->worktree->base_commit_id->sha1, 0);
3028 				if (err)
3029 					goto done;
3030 			}
3031 		} else {
3032 			int is_bad_symlink = 0;
3033 			sb.st_mode = GOT_DEFAULT_FILE_MODE;
3034 			if (S_ISLNK(mode2)) {
3035 				err = install_symlink(&is_bad_symlink,
3036 				    a->worktree, ondisk_path, path2, blob2, 0,
3037 				    0, 1, a->allow_bad_symlinks, repo,
3038 				    a->progress_cb, a->progress_arg);
3039 			} else {
3040 				err = install_blob(a->worktree, ondisk_path, path2,
3041 				    mode2, sb.st_mode, blob2, 0, 0, 0, 1, repo,
3042 				    a->progress_cb, a->progress_arg);
3043 			}
3044 			if (err)
3045 				goto done;
3046 			err = got_fileindex_entry_alloc(&ie, path2);
3047 			if (err)
3048 				goto done;
3049 			err = got_fileindex_entry_update(ie,
3050 			    a->worktree->root_fd, path2, NULL, NULL, 1);
3051 			if (err) {
3052 				got_fileindex_entry_free(ie);
3053 				goto done;
3054 			}
3055 			err = got_fileindex_entry_add(a->fileindex, ie);
3056 			if (err) {
3057 				got_fileindex_entry_free(ie);
3058 				goto done;
3059 			}
3060 			if (is_bad_symlink) {
3061 				got_fileindex_entry_filetype_set(ie,
3062 				    GOT_FILEIDX_MODE_BAD_SYMLINK);
3063 			}
3064 		}
3065 	}
3066 done:
3067 	if (f_orig && fclose(f_orig) == EOF && err == NULL)
3068 		err = got_error_from_errno("fclose");
3069 	if (f_deriv && fclose(f_deriv) == EOF && err == NULL)
3070 		err = got_error_from_errno("fclose");
3071 	if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
3072 		err = got_error_from_errno("fclose");
3073 	free(id_str);
3074 	free(label_deriv2);
3075 	free(ondisk_path);
3076 	return err;
3077 }
3078 
3079 static const struct got_error *
3080 check_mixed_commits(void *arg, struct got_fileindex_entry *ie)
3081 {
3082 	struct got_worktree *worktree = arg;
3083 
3084 	/* Reject merges into a work tree with mixed base commits. */
3085 	if (got_fileindex_entry_has_commit(ie) &&
3086 	    memcmp(ie->commit_sha1, worktree->base_commit_id->sha1,
3087 	    SHA1_DIGEST_LENGTH) != 0)
3088 		return got_error(GOT_ERR_MIXED_COMMITS);
3089 
3090 	return NULL;
3091 }
3092 
3093 struct check_merge_conflicts_arg {
3094 	struct got_worktree *worktree;
3095 	struct got_fileindex *fileindex;
3096 	struct got_repository *repo;
3097 };
3098 
3099 static const struct got_error *
3100 check_merge_conflicts(void *arg, struct got_blob_object *blob1,
3101     struct got_blob_object *blob2, FILE *f1, FILE *f2,
3102     struct got_object_id *id1, struct got_object_id *id2,
3103     const char *path1, const char *path2,
3104     mode_t mode1, mode_t mode2, struct got_repository *repo)
3105 {
3106 	const struct got_error *err = NULL;
3107 	struct check_merge_conflicts_arg *a = arg;
3108 	unsigned char status;
3109 	struct stat sb;
3110 	struct got_fileindex_entry *ie;
3111 	const char *path = path2 ? path2 : path1;
3112 	struct got_object_id *id = id2 ? id2 : id1;
3113 	char *ondisk_path;
3114 
3115 	if (id == NULL)
3116 		return NULL;
3117 
3118 	ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
3119 	if (ie == NULL)
3120 		return NULL;
3121 
3122 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
3123 	    == -1)
3124 		return got_error_from_errno("asprintf");
3125 
3126 	/* Reject merges into a work tree with conflicted files. */
3127 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
3128 	free(ondisk_path);
3129 	if (err)
3130 		return err;
3131 	if (status == GOT_STATUS_CONFLICT)
3132 		return got_error(GOT_ERR_CONFLICTS);
3133 
3134 	return NULL;
3135 }
3136 
3137 static const struct got_error *
3138 merge_files(struct got_worktree *worktree, struct got_fileindex *fileindex,
3139     const char *fileindex_path, struct got_object_id *commit_id1,
3140     struct got_object_id *commit_id2, struct got_repository *repo,
3141     got_worktree_checkout_cb progress_cb, void *progress_arg,
3142     got_cancel_cb cancel_cb, void *cancel_arg)
3143 {
3144 	const struct got_error *err = NULL, *sync_err;
3145 	struct got_object_id *tree_id1 = NULL, *tree_id2 = NULL;
3146 	struct got_tree_object *tree1 = NULL, *tree2 = NULL;
3147 	struct got_commit_object *commit1 = NULL, *commit2 = NULL;
3148 	struct check_merge_conflicts_arg cmc_arg;
3149 	struct merge_file_cb_arg arg;
3150 	char *label_orig = NULL;
3151 	FILE *f1 = NULL, *f2 = NULL;
3152 	int fd1 = -1, fd2 = -1;
3153 
3154 	if (commit_id1) {
3155 		err = got_object_open_as_commit(&commit1, repo, commit_id1);
3156 		if (err)
3157 			goto done;
3158 		err = got_object_id_by_path(&tree_id1, repo, commit1,
3159 		    worktree->path_prefix);
3160 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
3161 			goto done;
3162 	}
3163 	if (tree_id1) {
3164 		char *id_str;
3165 
3166 		err = got_object_open_as_tree(&tree1, repo, tree_id1);
3167 		if (err)
3168 			goto done;
3169 
3170 		err = got_object_id_str(&id_str, commit_id1);
3171 		if (err)
3172 			goto done;
3173 
3174 		if (asprintf(&label_orig, "%s: commit %s",
3175 		    GOT_MERGE_LABEL_BASE, id_str) == -1) {
3176 			err = got_error_from_errno("asprintf");
3177 			free(id_str);
3178 			goto done;
3179 		}
3180 		free(id_str);
3181 
3182 		f1 = got_opentemp();
3183 		if (f1 == NULL) {
3184 			err = got_error_from_errno("got_opentemp");
3185 			goto done;
3186 		}
3187 	}
3188 
3189 	err = got_object_open_as_commit(&commit2, repo, commit_id2);
3190 	if (err)
3191 		goto done;
3192 
3193 	err = got_object_id_by_path(&tree_id2, repo, commit2,
3194 	    worktree->path_prefix);
3195 	if (err)
3196 		goto done;
3197 
3198 	err = got_object_open_as_tree(&tree2, repo, tree_id2);
3199 	if (err)
3200 		goto done;
3201 
3202 	f2 = got_opentemp();
3203 	if (f2 == NULL) {
3204 		err = got_error_from_errno("got_opentemp");
3205 		goto done;
3206 	}
3207 
3208 	fd1 = got_opentempfd();
3209 	if (fd1 == -1) {
3210 		err = got_error_from_errno("got_opentempfd");
3211 		goto done;
3212 	}
3213 
3214 	fd2 = got_opentempfd();
3215 	if (fd2 == -1) {
3216 		err = got_error_from_errno("got_opentempfd");
3217 		goto done;
3218 	}
3219 
3220 	cmc_arg.worktree = worktree;
3221 	cmc_arg.fileindex = fileindex;
3222 	cmc_arg.repo = repo;
3223 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3224 	    check_merge_conflicts, &cmc_arg, 0);
3225 	if (err)
3226 		goto done;
3227 
3228 	arg.worktree = worktree;
3229 	arg.fileindex = fileindex;
3230 	arg.progress_cb = progress_cb;
3231 	arg.progress_arg = progress_arg;
3232 	arg.cancel_cb = cancel_cb;
3233 	arg.cancel_arg = cancel_arg;
3234 	arg.label_orig = label_orig;
3235 	arg.commit_id2 = commit_id2;
3236 	arg.allow_bad_symlinks = 1; /* preserve bad symlinks across merges */
3237 	err = got_diff_tree(tree1, tree2, f1, f2, fd1, fd2, "", "", repo,
3238 	    merge_file_cb, &arg, 1);
3239 	sync_err = sync_fileindex(fileindex, fileindex_path);
3240 	if (sync_err && err == NULL)
3241 		err = sync_err;
3242 done:
3243 	if (commit1)
3244 		got_object_commit_close(commit1);
3245 	if (commit2)
3246 		got_object_commit_close(commit2);
3247 	if (tree1)
3248 		got_object_tree_close(tree1);
3249 	if (tree2)
3250 		got_object_tree_close(tree2);
3251 	if (f1 && fclose(f1) == EOF && err == NULL)
3252 		err = got_error_from_errno("fclose");
3253 	if (f2 && fclose(f2) == EOF && err == NULL)
3254 		err = got_error_from_errno("fclose");
3255 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
3256 		err = got_error_from_errno("close");
3257 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
3258 		err = got_error_from_errno("close");
3259 	free(label_orig);
3260 	return err;
3261 }
3262 
3263 const struct got_error *
3264 got_worktree_merge_files(struct got_worktree *worktree,
3265     struct got_object_id *commit_id1, struct got_object_id *commit_id2,
3266     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
3267     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
3268 {
3269 	const struct got_error *err, *unlockerr;
3270 	char *fileindex_path = NULL;
3271 	struct got_fileindex *fileindex = NULL;
3272 
3273 	err = lock_worktree(worktree, LOCK_EX);
3274 	if (err)
3275 		return err;
3276 
3277 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3278 	if (err)
3279 		goto done;
3280 
3281 	err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
3282 	    worktree);
3283 	if (err)
3284 		goto done;
3285 
3286 	err = merge_files(worktree, fileindex, fileindex_path, commit_id1,
3287 	    commit_id2, repo, progress_cb, progress_arg,
3288 	    cancel_cb, cancel_arg);
3289 done:
3290 	if (fileindex)
3291 		got_fileindex_free(fileindex);
3292 	free(fileindex_path);
3293 	unlockerr = lock_worktree(worktree, LOCK_SH);
3294 	if (unlockerr && err == NULL)
3295 		err = unlockerr;
3296 	return err;
3297 }
3298 
3299 struct diff_dir_cb_arg {
3300     struct got_fileindex *fileindex;
3301     struct got_worktree *worktree;
3302     const char *status_path;
3303     size_t status_path_len;
3304     struct got_repository *repo;
3305     got_worktree_status_cb status_cb;
3306     void *status_arg;
3307     got_cancel_cb cancel_cb;
3308     void *cancel_arg;
3309     /* A pathlist containing per-directory pathlists of ignore patterns. */
3310     struct got_pathlist_head *ignores;
3311     int report_unchanged;
3312     int no_ignores;
3313 };
3314 
3315 static const struct got_error *
3316 report_file_status(struct got_fileindex_entry *ie, const char *abspath,
3317     int dirfd, const char *de_name,
3318     got_worktree_status_cb status_cb, void *status_arg,
3319     struct got_repository *repo, int report_unchanged)
3320 {
3321 	const struct got_error *err = NULL;
3322 	unsigned char status = GOT_STATUS_NO_CHANGE;
3323 	unsigned char staged_status = get_staged_status(ie);
3324 	struct stat sb;
3325 	struct got_object_id blob_id, commit_id, staged_blob_id;
3326 	struct got_object_id *blob_idp = NULL, *commit_idp = NULL;
3327 	struct got_object_id *staged_blob_idp = NULL;
3328 
3329 	err = get_file_status(&status, &sb, ie, abspath, dirfd, de_name, repo);
3330 	if (err)
3331 		return err;
3332 
3333 	if (status == GOT_STATUS_NO_CHANGE &&
3334 	    staged_status == GOT_STATUS_NO_CHANGE && !report_unchanged)
3335 		return NULL;
3336 
3337 	if (got_fileindex_entry_has_blob(ie)) {
3338 		memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3339 		blob_idp = &blob_id;
3340 	}
3341 	if (got_fileindex_entry_has_commit(ie)) {
3342 		memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3343 		commit_idp = &commit_id;
3344 	}
3345 	if (staged_status == GOT_STATUS_ADD ||
3346 	    staged_status == GOT_STATUS_MODIFY) {
3347 		memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
3348 		    SHA1_DIGEST_LENGTH);
3349 		staged_blob_idp = &staged_blob_id;
3350 	}
3351 
3352 	return (*status_cb)(status_arg, status, staged_status,
3353 	    ie->path, blob_idp, staged_blob_idp, commit_idp, dirfd, de_name);
3354 }
3355 
3356 static const struct got_error *
3357 status_old_new(void *arg, struct got_fileindex_entry *ie,
3358     struct dirent *de, const char *parent_path, int dirfd)
3359 {
3360 	const struct got_error *err = NULL;
3361 	struct diff_dir_cb_arg *a = arg;
3362 	char *abspath;
3363 
3364 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3365 		return got_error(GOT_ERR_CANCELLED);
3366 
3367 	if (got_path_cmp(parent_path, a->status_path,
3368 	    strlen(parent_path), a->status_path_len) != 0 &&
3369 	    !got_path_is_child(parent_path, a->status_path, a->status_path_len))
3370 		return NULL;
3371 
3372 	if (parent_path[0]) {
3373 		if (asprintf(&abspath, "%s/%s/%s", a->worktree->root_path,
3374 		    parent_path, de->d_name) == -1)
3375 			return got_error_from_errno("asprintf");
3376 	} else {
3377 		if (asprintf(&abspath, "%s/%s", a->worktree->root_path,
3378 		    de->d_name) == -1)
3379 			return got_error_from_errno("asprintf");
3380 	}
3381 
3382 	err = report_file_status(ie, abspath, dirfd, de->d_name,
3383 	    a->status_cb, a->status_arg, a->repo, a->report_unchanged);
3384 	free(abspath);
3385 	return err;
3386 }
3387 
3388 static const struct got_error *
3389 status_old(void *arg, struct got_fileindex_entry *ie, const char *parent_path)
3390 {
3391 	struct diff_dir_cb_arg *a = arg;
3392 	struct got_object_id blob_id, commit_id;
3393 	unsigned char status;
3394 
3395 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3396 		return got_error(GOT_ERR_CANCELLED);
3397 
3398 	if (!got_path_is_child(ie->path, a->status_path, a->status_path_len))
3399 		return NULL;
3400 
3401 	memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
3402 	memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
3403 	if (got_fileindex_entry_has_file_on_disk(ie))
3404 		status = GOT_STATUS_MISSING;
3405 	else
3406 		status = GOT_STATUS_DELETE;
3407 	return (*a->status_cb)(a->status_arg, status, get_staged_status(ie),
3408 	    ie->path, &blob_id, NULL, &commit_id, -1, NULL);
3409 }
3410 
3411 static void
3412 free_ignorelist(struct got_pathlist_head *ignorelist)
3413 {
3414 	struct got_pathlist_entry *pe;
3415 
3416 	TAILQ_FOREACH(pe, ignorelist, entry)
3417 		free((char *)pe->path);
3418 	got_pathlist_free(ignorelist);
3419 }
3420 
3421 static void
3422 free_ignores(struct got_pathlist_head *ignores)
3423 {
3424 	struct got_pathlist_entry *pe;
3425 
3426 	TAILQ_FOREACH(pe, ignores, entry) {
3427 		struct got_pathlist_head *ignorelist = pe->data;
3428 		free_ignorelist(ignorelist);
3429 		free((char *)pe->path);
3430 	}
3431 	got_pathlist_free(ignores);
3432 }
3433 
3434 static const struct got_error *
3435 read_ignores(struct got_pathlist_head *ignores, const char *path, FILE *f)
3436 {
3437 	const struct got_error *err = NULL;
3438 	struct got_pathlist_entry *pe = NULL;
3439 	struct got_pathlist_head *ignorelist;
3440 	char *line = NULL, *pattern, *dirpath = NULL;
3441 	size_t linesize = 0;
3442 	ssize_t linelen;
3443 
3444 	ignorelist = calloc(1, sizeof(*ignorelist));
3445 	if (ignorelist == NULL)
3446 		return got_error_from_errno("calloc");
3447 	TAILQ_INIT(ignorelist);
3448 
3449 	while ((linelen = getline(&line, &linesize, f)) != -1) {
3450 		if (linelen > 0 && line[linelen - 1] == '\n')
3451 			line[linelen - 1] = '\0';
3452 
3453 		/* Git's ignores may contain comments. */
3454 		if (line[0] == '#')
3455 			continue;
3456 
3457 		/* Git's negated patterns are not (yet?) supported. */
3458 		if (line[0] == '!')
3459 			continue;
3460 
3461 		if (asprintf(&pattern, "%s%s%s", path, path[0] ? "/" : "",
3462 		    line) == -1) {
3463 			err = got_error_from_errno("asprintf");
3464 			goto done;
3465 		}
3466 		err = got_pathlist_insert(NULL, ignorelist, pattern, NULL);
3467 		if (err)
3468 			goto done;
3469 	}
3470 	if (ferror(f)) {
3471 		err = got_error_from_errno("getline");
3472 		goto done;
3473 	}
3474 
3475 	dirpath = strdup(path);
3476 	if (dirpath == NULL) {
3477 		err = got_error_from_errno("strdup");
3478 		goto done;
3479 	}
3480 	err = got_pathlist_insert(&pe, ignores, dirpath, ignorelist);
3481 done:
3482 	free(line);
3483 	if (err || pe == NULL) {
3484 		free(dirpath);
3485 		free_ignorelist(ignorelist);
3486 	}
3487 	return err;
3488 }
3489 
3490 static int
3491 match_ignores(struct got_pathlist_head *ignores, const char *path)
3492 {
3493 	struct got_pathlist_entry *pe;
3494 
3495 	/* Handle patterns which match in all directories. */
3496 	TAILQ_FOREACH(pe, ignores, entry) {
3497 		struct got_pathlist_head *ignorelist = pe->data;
3498 		struct got_pathlist_entry *pi;
3499 
3500 		TAILQ_FOREACH(pi, ignorelist, entry) {
3501 			const char *p, *pattern = pi->path;
3502 
3503 			if (strncmp(pattern, "**/", 3) != 0)
3504 				continue;
3505 			pattern += 3;
3506 			p = path;
3507 			while (*p) {
3508 				if (fnmatch(pattern, p,
3509 				    FNM_PATHNAME | FNM_LEADING_DIR)) {
3510 					/* Retry in next directory. */
3511 					while (*p && *p != '/')
3512 						p++;
3513 					while (*p == '/')
3514 						p++;
3515 					continue;
3516 				}
3517 				return 1;
3518 			}
3519 		}
3520 	}
3521 
3522 	/*
3523 	 * The ignores pathlist contains ignore lists from children before
3524 	 * parents, so we can find the most specific ignorelist by walking
3525 	 * ignores backwards.
3526 	 */
3527 	pe = TAILQ_LAST(ignores, got_pathlist_head);
3528 	while (pe) {
3529 		if (got_path_is_child(path, pe->path, pe->path_len)) {
3530 			struct got_pathlist_head *ignorelist = pe->data;
3531 			struct got_pathlist_entry *pi;
3532 			TAILQ_FOREACH(pi, ignorelist, entry) {
3533 				const char *pattern = pi->path;
3534 				int flags = FNM_LEADING_DIR;
3535 				if (strstr(pattern, "/**/") == NULL)
3536 					flags |= FNM_PATHNAME;
3537 				if (fnmatch(pattern, path, flags))
3538 					continue;
3539 				return 1;
3540 			}
3541 		}
3542 		pe = TAILQ_PREV(pe, got_pathlist_head, entry);
3543 	}
3544 
3545 	return 0;
3546 }
3547 
3548 static const struct got_error *
3549 add_ignores(struct got_pathlist_head *ignores, const char *root_path,
3550     const char *path, int dirfd, const char *ignores_filename)
3551 {
3552 	const struct got_error *err = NULL;
3553 	char *ignorespath;
3554 	int fd = -1;
3555 	FILE *ignoresfile = NULL;
3556 
3557 	if (asprintf(&ignorespath, "%s/%s%s%s", root_path, path,
3558 	    path[0] ? "/" : "", ignores_filename) == -1)
3559 		return got_error_from_errno("asprintf");
3560 
3561 	if (dirfd != -1) {
3562 		fd = openat(dirfd, ignores_filename,
3563 		    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
3564 		if (fd == -1) {
3565 			if (errno != ENOENT && errno != EACCES)
3566 				err = got_error_from_errno2("openat",
3567 				    ignorespath);
3568 		} else {
3569 			ignoresfile = fdopen(fd, "r");
3570 			if (ignoresfile == NULL)
3571 				err = got_error_from_errno2("fdopen",
3572 				    ignorespath);
3573 			else {
3574 				fd = -1;
3575 				err = read_ignores(ignores, path, ignoresfile);
3576 			}
3577 		}
3578 	} else {
3579 		ignoresfile = fopen(ignorespath, "re");
3580 		if (ignoresfile == NULL) {
3581 			if (errno != ENOENT && errno != EACCES)
3582 				err = got_error_from_errno2("fopen",
3583 				    ignorespath);
3584 		} else
3585 			err = read_ignores(ignores, path, ignoresfile);
3586 	}
3587 
3588 	if (ignoresfile && fclose(ignoresfile) == EOF && err == NULL)
3589 		err = got_error_from_errno2("fclose", path);
3590 	if (fd != -1 && close(fd) == -1 && err == NULL)
3591 		err = got_error_from_errno2("close", path);
3592 	free(ignorespath);
3593 	return err;
3594 }
3595 
3596 static const struct got_error *
3597 status_new(int *ignore, void *arg, struct dirent *de, const char *parent_path,
3598     int dirfd)
3599 {
3600 	const struct got_error *err = NULL;
3601 	struct diff_dir_cb_arg *a = arg;
3602 	char *path = NULL;
3603 
3604 	if (ignore != NULL)
3605 		*ignore = 0;
3606 
3607 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
3608 		return got_error(GOT_ERR_CANCELLED);
3609 
3610 	if (parent_path[0]) {
3611 		if (asprintf(&path, "%s/%s", parent_path, de->d_name) == -1)
3612 			return got_error_from_errno("asprintf");
3613 	} else {
3614 		path = de->d_name;
3615 	}
3616 
3617 	if (de->d_type == DT_DIR) {
3618 		if (!a->no_ignores && ignore != NULL &&
3619 		    match_ignores(a->ignores, path))
3620 			*ignore = 1;
3621 	} else if (!match_ignores(a->ignores, path) &&
3622 	    got_path_is_child(path, a->status_path, a->status_path_len))
3623 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_UNVERSIONED,
3624 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3625 	if (parent_path[0])
3626 		free(path);
3627 	return err;
3628 }
3629 
3630 static const struct got_error *
3631 status_traverse(void *arg, const char *path, int dirfd)
3632 {
3633 	const struct got_error *err = NULL;
3634 	struct diff_dir_cb_arg *a = arg;
3635 
3636 	if (a->no_ignores)
3637 		return NULL;
3638 
3639 	err = add_ignores(a->ignores, a->worktree->root_path,
3640 	    path, dirfd, ".cvsignore");
3641 	if (err)
3642 		return err;
3643 
3644 	err = add_ignores(a->ignores, a->worktree->root_path, path,
3645 	    dirfd, ".gitignore");
3646 
3647 	return err;
3648 }
3649 
3650 static const struct got_error *
3651 report_single_file_status(const char *path, const char *ondisk_path,
3652     struct got_fileindex *fileindex, got_worktree_status_cb status_cb,
3653     void *status_arg, struct got_repository *repo, int report_unchanged,
3654     struct got_pathlist_head *ignores, int no_ignores)
3655 {
3656 	struct got_fileindex_entry *ie;
3657 	struct stat sb;
3658 
3659 	ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3660 	if (ie)
3661 		return report_file_status(ie, ondisk_path, -1, NULL,
3662 		    status_cb, status_arg, repo, report_unchanged);
3663 
3664 	if (lstat(ondisk_path, &sb) == -1) {
3665 		if (errno != ENOENT)
3666 			return got_error_from_errno2("lstat", ondisk_path);
3667 		return (*status_cb)(status_arg, GOT_STATUS_NONEXISTENT,
3668 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3669 	}
3670 
3671 	if (!no_ignores && match_ignores(ignores, path))
3672 		return NULL;
3673 
3674 	if (S_ISREG(sb.st_mode) || S_ISLNK(sb.st_mode))
3675 		return (*status_cb)(status_arg, GOT_STATUS_UNVERSIONED,
3676 		    GOT_STATUS_NO_CHANGE, path, NULL, NULL, NULL, -1, NULL);
3677 
3678 	return NULL;
3679 }
3680 
3681 static const struct got_error *
3682 add_ignores_from_parent_paths(struct got_pathlist_head *ignores,
3683     const char *root_path, const char *path)
3684 {
3685 	const struct got_error *err;
3686 	char *parent_path, *next_parent_path = NULL;
3687 
3688 	err = add_ignores(ignores, root_path, "", -1,
3689 	    ".cvsignore");
3690 	if (err)
3691 		return err;
3692 
3693 	err = add_ignores(ignores, root_path, "", -1,
3694 	    ".gitignore");
3695 	if (err)
3696 		return err;
3697 
3698 	err = got_path_dirname(&parent_path, path);
3699 	if (err) {
3700 		if (err->code == GOT_ERR_BAD_PATH)
3701 			return NULL; /* cannot traverse parent */
3702 		return err;
3703 	}
3704 	for (;;) {
3705 		err = add_ignores(ignores, root_path, parent_path, -1,
3706 		    ".cvsignore");
3707 		if (err)
3708 			break;
3709 		err = add_ignores(ignores, root_path, parent_path, -1,
3710 		    ".gitignore");
3711 		if (err)
3712 			break;
3713 		err = got_path_dirname(&next_parent_path, parent_path);
3714 		if (err) {
3715 			if (err->code == GOT_ERR_BAD_PATH)
3716 				err = NULL; /* traversed everything */
3717 			break;
3718 		}
3719 		if (got_path_is_root_dir(parent_path))
3720 			break;
3721 		free(parent_path);
3722 		parent_path = next_parent_path;
3723 		next_parent_path = NULL;
3724 	}
3725 
3726 	free(parent_path);
3727 	free(next_parent_path);
3728 	return err;
3729 }
3730 
3731 static const struct got_error *
3732 worktree_status(struct got_worktree *worktree, const char *path,
3733     struct got_fileindex *fileindex, struct got_repository *repo,
3734     got_worktree_status_cb status_cb, void *status_arg,
3735     got_cancel_cb cancel_cb, void *cancel_arg, int no_ignores,
3736     int report_unchanged)
3737 {
3738 	const struct got_error *err = NULL;
3739 	int fd = -1;
3740 	struct got_fileindex_diff_dir_cb fdiff_cb;
3741 	struct diff_dir_cb_arg arg;
3742 	char *ondisk_path = NULL;
3743 	struct got_pathlist_head ignores;
3744 	struct got_fileindex_entry *ie;
3745 
3746 	TAILQ_INIT(&ignores);
3747 
3748 	if (asprintf(&ondisk_path, "%s%s%s",
3749 	    worktree->root_path, path[0] ? "/" : "", path) == -1)
3750 		return got_error_from_errno("asprintf");
3751 
3752 	ie = got_fileindex_entry_get(fileindex, path, strlen(path));
3753 	if (ie) {
3754 		err = report_single_file_status(path, ondisk_path,
3755 		    fileindex, status_cb, status_arg, repo,
3756 		    report_unchanged, &ignores, no_ignores);
3757 		goto done;
3758 	}
3759 
3760 	fd = open(ondisk_path, O_RDONLY | O_NOFOLLOW | O_DIRECTORY | O_CLOEXEC);
3761 	if (fd == -1) {
3762 		if (errno != ENOTDIR && errno != ENOENT && errno != EACCES &&
3763 		    !got_err_open_nofollow_on_symlink())
3764 			err = got_error_from_errno2("open", ondisk_path);
3765 		else {
3766 			if (!no_ignores) {
3767 				err = add_ignores_from_parent_paths(&ignores,
3768 				    worktree->root_path, ondisk_path);
3769 				if (err)
3770 					goto done;
3771 			}
3772 			err = report_single_file_status(path, ondisk_path,
3773 			    fileindex, status_cb, status_arg, repo,
3774 			    report_unchanged, &ignores, no_ignores);
3775 		}
3776 	} else {
3777 		fdiff_cb.diff_old_new = status_old_new;
3778 		fdiff_cb.diff_old = status_old;
3779 		fdiff_cb.diff_new = status_new;
3780 		fdiff_cb.diff_traverse = status_traverse;
3781 		arg.fileindex = fileindex;
3782 		arg.worktree = worktree;
3783 		arg.status_path = path;
3784 		arg.status_path_len = strlen(path);
3785 		arg.repo = repo;
3786 		arg.status_cb = status_cb;
3787 		arg.status_arg = status_arg;
3788 		arg.cancel_cb = cancel_cb;
3789 		arg.cancel_arg = cancel_arg;
3790 		arg.report_unchanged = report_unchanged;
3791 		arg.no_ignores = no_ignores;
3792 		if (!no_ignores) {
3793 			err = add_ignores_from_parent_paths(&ignores,
3794 			    worktree->root_path, path);
3795 			if (err)
3796 				goto done;
3797 		}
3798 		arg.ignores = &ignores;
3799 		err = got_fileindex_diff_dir(fileindex, fd,
3800 		    worktree->root_path, path, repo, &fdiff_cb, &arg);
3801 	}
3802 done:
3803 	free_ignores(&ignores);
3804 	if (fd != -1 && close(fd) == -1 && err == NULL)
3805 		err = got_error_from_errno("close");
3806 	free(ondisk_path);
3807 	return err;
3808 }
3809 
3810 const struct got_error *
3811 got_worktree_status(struct got_worktree *worktree,
3812     struct got_pathlist_head *paths, struct got_repository *repo,
3813     int no_ignores, got_worktree_status_cb status_cb, void *status_arg,
3814     got_cancel_cb cancel_cb, void *cancel_arg)
3815 {
3816 	const struct got_error *err = NULL;
3817 	char *fileindex_path = NULL;
3818 	struct got_fileindex *fileindex = NULL;
3819 	struct got_pathlist_entry *pe;
3820 
3821 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
3822 	if (err)
3823 		return err;
3824 
3825 	TAILQ_FOREACH(pe, paths, entry) {
3826 		err = worktree_status(worktree, pe->path, fileindex, repo,
3827 			status_cb, status_arg, cancel_cb, cancel_arg,
3828 			no_ignores, 0);
3829 		if (err)
3830 			break;
3831 	}
3832 	free(fileindex_path);
3833 	got_fileindex_free(fileindex);
3834 	return err;
3835 }
3836 
3837 const struct got_error *
3838 got_worktree_resolve_path(char **wt_path, struct got_worktree *worktree,
3839     const char *arg)
3840 {
3841 	const struct got_error *err = NULL;
3842 	char *resolved = NULL, *cwd = NULL, *path = NULL;
3843 	size_t len;
3844 	struct stat sb;
3845 	char *abspath = NULL;
3846 	char canonpath[PATH_MAX];
3847 
3848 	*wt_path = NULL;
3849 
3850 	cwd = getcwd(NULL, 0);
3851 	if (cwd == NULL)
3852 		return got_error_from_errno("getcwd");
3853 
3854 	if (lstat(arg, &sb) == -1) {
3855 		if (errno != ENOENT) {
3856 			err = got_error_from_errno2("lstat", arg);
3857 			goto done;
3858 		}
3859 		sb.st_mode = 0;
3860 	}
3861 	if (S_ISLNK(sb.st_mode)) {
3862 		/*
3863 		 * We cannot use realpath(3) with symlinks since we want to
3864 		 * operate on the symlink itself.
3865 		 * But we can make the path absolute, assuming it is relative
3866 		 * to the current working directory, and then canonicalize it.
3867 		 */
3868 		if (!got_path_is_absolute(arg)) {
3869 			if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3870 				err = got_error_from_errno("asprintf");
3871 				goto done;
3872 			}
3873 
3874 		}
3875 		err = got_canonpath(abspath ? abspath : arg, canonpath,
3876 		    sizeof(canonpath));
3877 		if (err)
3878 			goto done;
3879 		resolved = strdup(canonpath);
3880 		if (resolved == NULL) {
3881 			err = got_error_from_errno("strdup");
3882 			goto done;
3883 		}
3884 	} else {
3885 		resolved = realpath(arg, NULL);
3886 		if (resolved == NULL) {
3887 			if (errno != ENOENT) {
3888 				err = got_error_from_errno2("realpath", arg);
3889 				goto done;
3890 			}
3891 			if (asprintf(&abspath, "%s/%s", cwd, arg) == -1) {
3892 				err = got_error_from_errno("asprintf");
3893 				goto done;
3894 			}
3895 			err = got_canonpath(abspath, canonpath,
3896 			    sizeof(canonpath));
3897 			if (err)
3898 				goto done;
3899 			resolved = strdup(canonpath);
3900 			if (resolved == NULL) {
3901 				err = got_error_from_errno("strdup");
3902 				goto done;
3903 			}
3904 		}
3905 	}
3906 
3907 	if (strncmp(got_worktree_get_root_path(worktree), resolved,
3908 	    strlen(got_worktree_get_root_path(worktree)))) {
3909 		err = got_error_path(resolved, GOT_ERR_BAD_PATH);
3910 		goto done;
3911 	}
3912 
3913 	if (strlen(resolved) > strlen(got_worktree_get_root_path(worktree))) {
3914 		err = got_path_skip_common_ancestor(&path,
3915 		    got_worktree_get_root_path(worktree), resolved);
3916 		if (err)
3917 			goto done;
3918 	} else {
3919 		path = strdup("");
3920 		if (path == NULL) {
3921 			err = got_error_from_errno("strdup");
3922 			goto done;
3923 		}
3924 	}
3925 
3926 	/* XXX status walk can't deal with trailing slash! */
3927 	len = strlen(path);
3928 	while (len > 0 && path[len - 1] == '/') {
3929 		path[len - 1] = '\0';
3930 		len--;
3931 	}
3932 done:
3933 	free(abspath);
3934 	free(resolved);
3935 	free(cwd);
3936 	if (err == NULL)
3937 		*wt_path = path;
3938 	else
3939 		free(path);
3940 	return err;
3941 }
3942 
3943 struct schedule_addition_args {
3944 	struct got_worktree *worktree;
3945 	struct got_fileindex *fileindex;
3946 	got_worktree_checkout_cb progress_cb;
3947 	void *progress_arg;
3948 	struct got_repository *repo;
3949 };
3950 
3951 static const struct got_error *
3952 schedule_addition(void *arg, unsigned char status, unsigned char staged_status,
3953     const char *relpath, struct got_object_id *blob_id,
3954     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
3955     int dirfd, const char *de_name)
3956 {
3957 	struct schedule_addition_args *a = arg;
3958 	const struct got_error *err = NULL;
3959 	struct got_fileindex_entry *ie;
3960 	struct stat sb;
3961 	char *ondisk_path;
3962 
3963 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
3964 	    relpath) == -1)
3965 		return got_error_from_errno("asprintf");
3966 
3967 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
3968 	if (ie) {
3969 		err = get_file_status(&status, &sb, ie, ondisk_path, dirfd,
3970 		    de_name, a->repo);
3971 		if (err)
3972 			goto done;
3973 		/* Re-adding an existing entry is a no-op. */
3974 		if (status == GOT_STATUS_ADD)
3975 			goto done;
3976 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
3977 		if (err)
3978 			goto done;
3979 	}
3980 
3981 	if (status != GOT_STATUS_UNVERSIONED) {
3982 		if (status == GOT_STATUS_NONEXISTENT)
3983 			err = got_error_set_errno(ENOENT, ondisk_path);
3984 		else
3985 			err = got_error_path(ondisk_path, GOT_ERR_FILE_STATUS);
3986 		goto done;
3987 	}
3988 
3989 	err = got_fileindex_entry_alloc(&ie, relpath);
3990 	if (err)
3991 		goto done;
3992 	err = got_fileindex_entry_update(ie, a->worktree->root_fd,
3993 	    relpath, NULL, NULL, 1);
3994 	if (err) {
3995 		got_fileindex_entry_free(ie);
3996 		goto done;
3997 	}
3998 	err = got_fileindex_entry_add(a->fileindex, ie);
3999 	if (err) {
4000 		got_fileindex_entry_free(ie);
4001 		goto done;
4002 	}
4003 done:
4004 	free(ondisk_path);
4005 	if (err)
4006 		return err;
4007 	if (status == GOT_STATUS_ADD)
4008 		return NULL;
4009 	return (*a->progress_cb)(a->progress_arg, GOT_STATUS_ADD, relpath);
4010 }
4011 
4012 const struct got_error *
4013 got_worktree_schedule_add(struct got_worktree *worktree,
4014     struct got_pathlist_head *paths,
4015     got_worktree_checkout_cb progress_cb, void *progress_arg,
4016     struct got_repository *repo, int no_ignores)
4017 {
4018 	struct got_fileindex *fileindex = NULL;
4019 	char *fileindex_path = NULL;
4020 	const struct got_error *err = NULL, *sync_err, *unlockerr;
4021 	struct got_pathlist_entry *pe;
4022 	struct schedule_addition_args saa;
4023 
4024 	err = lock_worktree(worktree, LOCK_EX);
4025 	if (err)
4026 		return err;
4027 
4028 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4029 	if (err)
4030 		goto done;
4031 
4032 	saa.worktree = worktree;
4033 	saa.fileindex = fileindex;
4034 	saa.progress_cb = progress_cb;
4035 	saa.progress_arg = progress_arg;
4036 	saa.repo = repo;
4037 
4038 	TAILQ_FOREACH(pe, paths, entry) {
4039 		err = worktree_status(worktree, pe->path, fileindex, repo,
4040 			schedule_addition, &saa, NULL, NULL, no_ignores, 0);
4041 		if (err)
4042 			break;
4043 	}
4044 	sync_err = sync_fileindex(fileindex, fileindex_path);
4045 	if (sync_err && err == NULL)
4046 		err = sync_err;
4047 done:
4048 	free(fileindex_path);
4049 	if (fileindex)
4050 		got_fileindex_free(fileindex);
4051 	unlockerr = lock_worktree(worktree, LOCK_SH);
4052 	if (unlockerr && err == NULL)
4053 		err = unlockerr;
4054 	return err;
4055 }
4056 
4057 struct schedule_deletion_args {
4058 	struct got_worktree *worktree;
4059 	struct got_fileindex *fileindex;
4060 	got_worktree_delete_cb progress_cb;
4061 	void *progress_arg;
4062 	struct got_repository *repo;
4063 	int delete_local_mods;
4064 	int keep_on_disk;
4065 	int ignore_missing_paths;
4066 	const char *status_codes;
4067 };
4068 
4069 static const struct got_error *
4070 schedule_for_deletion(void *arg, unsigned char status,
4071     unsigned char staged_status, const char *relpath,
4072     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
4073     struct got_object_id *commit_id, int dirfd, const char *de_name)
4074 {
4075 	struct schedule_deletion_args *a = arg;
4076 	const struct got_error *err = NULL;
4077 	struct got_fileindex_entry *ie = NULL;
4078 	struct stat sb;
4079 	char *ondisk_path;
4080 
4081 	if (status == GOT_STATUS_NONEXISTENT) {
4082 		if (a->ignore_missing_paths)
4083 			return NULL;
4084 		return got_error_set_errno(ENOENT, relpath);
4085 	}
4086 
4087 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4088 	if (ie == NULL)
4089 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
4090 
4091 	staged_status = get_staged_status(ie);
4092 	if (staged_status != GOT_STATUS_NO_CHANGE) {
4093 		if (staged_status == GOT_STATUS_DELETE)
4094 			return NULL;
4095 		return got_error_path(relpath, GOT_ERR_FILE_STAGED);
4096 	}
4097 
4098 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
4099 	    relpath) == -1)
4100 		return got_error_from_errno("asprintf");
4101 
4102 	err = get_file_status(&status, &sb, ie, ondisk_path, dirfd, de_name,
4103 	    a->repo);
4104 	if (err)
4105 		goto done;
4106 
4107 	if (a->status_codes) {
4108 		size_t ncodes = strlen(a->status_codes);
4109 		int i;
4110 		for (i = 0; i < ncodes ; i++) {
4111 			if (status == a->status_codes[i])
4112 				break;
4113 		}
4114 		if (i == ncodes) {
4115 			/* Do not delete files in non-matching status. */
4116 			free(ondisk_path);
4117 			return NULL;
4118 		}
4119 		if (a->status_codes[i] != GOT_STATUS_MODIFY &&
4120 		    a->status_codes[i] != GOT_STATUS_MISSING) {
4121 			static char msg[64];
4122 			snprintf(msg, sizeof(msg),
4123 			    "invalid status code '%c'", a->status_codes[i]);
4124 			err = got_error_msg(GOT_ERR_FILE_STATUS, msg);
4125 			goto done;
4126 		}
4127 	}
4128 
4129 	if (status != GOT_STATUS_NO_CHANGE) {
4130 		if (status == GOT_STATUS_DELETE)
4131 			goto done;
4132 		if (status == GOT_STATUS_MODIFY && !a->delete_local_mods) {
4133 			err = got_error_path(relpath, GOT_ERR_FILE_MODIFIED);
4134 			goto done;
4135 		}
4136 		if (status == GOT_STATUS_MISSING && !a->ignore_missing_paths) {
4137 			err = got_error_set_errno(ENOENT, relpath);
4138 			goto done;
4139 		}
4140 		if (status != GOT_STATUS_MODIFY &&
4141 		    status != GOT_STATUS_MISSING) {
4142 			err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
4143 			goto done;
4144 		}
4145 	}
4146 
4147 	if (!a->keep_on_disk && status != GOT_STATUS_MISSING) {
4148 		size_t root_len;
4149 
4150 		if (dirfd != -1) {
4151 			if (unlinkat(dirfd, de_name, 0) == -1) {
4152 				err = got_error_from_errno2("unlinkat",
4153 				    ondisk_path);
4154 				goto done;
4155 			}
4156 		} else if (unlink(ondisk_path) == -1) {
4157 			err = got_error_from_errno2("unlink", ondisk_path);
4158 			goto done;
4159 		}
4160 
4161 		root_len = strlen(a->worktree->root_path);
4162 		do {
4163 			char *parent;
4164 			err = got_path_dirname(&parent, ondisk_path);
4165 			if (err)
4166 				goto done;
4167 			free(ondisk_path);
4168 			ondisk_path = parent;
4169 			if (rmdir(ondisk_path) == -1) {
4170 				if (errno != ENOTEMPTY)
4171 					err = got_error_from_errno2("rmdir",
4172 					    ondisk_path);
4173 				break;
4174 			}
4175 		} while (got_path_cmp(ondisk_path, a->worktree->root_path,
4176 		    strlen(ondisk_path), root_len) != 0);
4177 	}
4178 
4179 	got_fileindex_entry_mark_deleted_from_disk(ie);
4180 done:
4181 	free(ondisk_path);
4182 	if (err)
4183 		return err;
4184 	if (status == GOT_STATUS_DELETE)
4185 		return NULL;
4186 	return (*a->progress_cb)(a->progress_arg, GOT_STATUS_DELETE,
4187 	    staged_status, relpath);
4188 }
4189 
4190 const struct got_error *
4191 got_worktree_schedule_delete(struct got_worktree *worktree,
4192     struct got_pathlist_head *paths, int delete_local_mods,
4193     const char *status_codes,
4194     got_worktree_delete_cb progress_cb, void *progress_arg,
4195     struct got_repository *repo, int keep_on_disk, int ignore_missing_paths)
4196 {
4197 	struct got_fileindex *fileindex = NULL;
4198 	char *fileindex_path = NULL;
4199 	const struct got_error *err = NULL, *sync_err, *unlockerr;
4200 	struct got_pathlist_entry *pe;
4201 	struct schedule_deletion_args sda;
4202 
4203 	err = lock_worktree(worktree, LOCK_EX);
4204 	if (err)
4205 		return err;
4206 
4207 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4208 	if (err)
4209 		goto done;
4210 
4211 	sda.worktree = worktree;
4212 	sda.fileindex = fileindex;
4213 	sda.progress_cb = progress_cb;
4214 	sda.progress_arg = progress_arg;
4215 	sda.repo = repo;
4216 	sda.delete_local_mods = delete_local_mods;
4217 	sda.keep_on_disk = keep_on_disk;
4218 	sda.ignore_missing_paths = ignore_missing_paths;
4219 	sda.status_codes = status_codes;
4220 
4221 	TAILQ_FOREACH(pe, paths, entry) {
4222 		err = worktree_status(worktree, pe->path, fileindex, repo,
4223 			schedule_for_deletion, &sda, NULL, NULL, 1, 1);
4224 		if (err)
4225 			break;
4226 	}
4227 	sync_err = sync_fileindex(fileindex, fileindex_path);
4228 	if (sync_err && err == NULL)
4229 		err = sync_err;
4230 done:
4231 	free(fileindex_path);
4232 	if (fileindex)
4233 		got_fileindex_free(fileindex);
4234 	unlockerr = lock_worktree(worktree, LOCK_SH);
4235 	if (unlockerr && err == NULL)
4236 		err = unlockerr;
4237 	return err;
4238 }
4239 
4240 static const struct got_error *
4241 copy_one_line(FILE *infile, FILE *outfile, FILE *rejectfile)
4242 {
4243 	const struct got_error *err = NULL;
4244 	char *line = NULL;
4245 	size_t linesize = 0, n;
4246 	ssize_t linelen;
4247 
4248 	linelen = getline(&line, &linesize, infile);
4249 	if (linelen == -1) {
4250 		if (ferror(infile)) {
4251 			err = got_error_from_errno("getline");
4252 			goto done;
4253 		}
4254 		return NULL;
4255 	}
4256 	if (outfile) {
4257 		n = fwrite(line, 1, linelen, outfile);
4258 		if (n != linelen) {
4259 			err = got_ferror(outfile, GOT_ERR_IO);
4260 			goto done;
4261 		}
4262 	}
4263 	if (rejectfile) {
4264 		n = fwrite(line, 1, linelen, rejectfile);
4265 		if (n != linelen)
4266 			err = got_ferror(outfile, GOT_ERR_IO);
4267 	}
4268 done:
4269 	free(line);
4270 	return err;
4271 }
4272 
4273 static const struct got_error *
4274 skip_one_line(FILE *f)
4275 {
4276 	char *line = NULL;
4277 	size_t linesize = 0;
4278 	ssize_t linelen;
4279 
4280 	linelen = getline(&line, &linesize, f);
4281 	if (linelen == -1) {
4282 		if (ferror(f))
4283 			return got_error_from_errno("getline");
4284 		return NULL;
4285 	}
4286 	free(line);
4287 	return NULL;
4288 }
4289 
4290 static const struct got_error *
4291 copy_change(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4292     int start_old, int end_old, int start_new, int end_new,
4293     FILE *outfile, FILE *rejectfile)
4294 {
4295 	const struct got_error *err;
4296 
4297 	/* Copy old file's lines leading up to patch. */
4298 	while (!feof(f1) && *line_cur1 < start_old) {
4299 		err = copy_one_line(f1, outfile, NULL);
4300 		if (err)
4301 			return err;
4302 		(*line_cur1)++;
4303 	}
4304 	/* Skip new file's lines leading up to patch. */
4305 	while (!feof(f2) && *line_cur2 < start_new) {
4306 		if (rejectfile)
4307 			err = copy_one_line(f2, NULL, rejectfile);
4308 		else
4309 			err = skip_one_line(f2);
4310 		if (err)
4311 			return err;
4312 		(*line_cur2)++;
4313 	}
4314 	/* Copy patched lines. */
4315 	while (!feof(f2) && *line_cur2 <= end_new) {
4316 		err = copy_one_line(f2, outfile, NULL);
4317 		if (err)
4318 			return err;
4319 		(*line_cur2)++;
4320 	}
4321 	/* Skip over old file's replaced lines. */
4322 	while (!feof(f1) && *line_cur1 <= end_old) {
4323 		if (rejectfile)
4324 			err = copy_one_line(f1, NULL, rejectfile);
4325 		else
4326 			err = skip_one_line(f1);
4327 		if (err)
4328 			return err;
4329 		(*line_cur1)++;
4330 	}
4331 
4332 	return NULL;
4333 }
4334 
4335 static const struct got_error *
4336 copy_remaining_content(FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4337     FILE *outfile, FILE *rejectfile)
4338 {
4339 	const struct got_error *err;
4340 
4341 	if (outfile) {
4342 		/* Copy old file's lines until EOF. */
4343 		while (!feof(f1)) {
4344 			err = copy_one_line(f1, outfile, NULL);
4345 			if (err)
4346 				return err;
4347 			(*line_cur1)++;
4348 		}
4349 	}
4350 	if (rejectfile) {
4351 		/* Copy new file's lines until EOF. */
4352 		while (!feof(f2)) {
4353 			err = copy_one_line(f2, NULL, rejectfile);
4354 			if (err)
4355 				return err;
4356 			(*line_cur2)++;
4357 		}
4358 	}
4359 
4360 	return NULL;
4361 }
4362 
4363 static const struct got_error *
4364 apply_or_reject_change(int *choice, int *nchunks_used,
4365     struct diff_result *diff_result, int n,
4366     const char *relpath, FILE *f1, FILE *f2, int *line_cur1, int *line_cur2,
4367     FILE *outfile, FILE *rejectfile, int changeno, int nchanges,
4368     got_worktree_patch_cb patch_cb, void *patch_arg)
4369 {
4370 	const struct got_error *err = NULL;
4371 	struct diff_chunk_context cc = {};
4372 	int start_old, end_old, start_new, end_new;
4373 	FILE *hunkfile;
4374 	struct diff_output_unidiff_state *diff_state;
4375 	struct diff_input_info diff_info;
4376 	int rc;
4377 
4378 	*choice = GOT_PATCH_CHOICE_NONE;
4379 
4380 	/* Get changed line numbers without context lines for copy_change(). */
4381 	diff_chunk_context_load_change(&cc, NULL, diff_result, n, 0);
4382 	start_old = cc.left.start;
4383 	end_old = cc.left.end;
4384 	start_new = cc.right.start;
4385 	end_new = cc.right.end;
4386 
4387 	/* Get the same change with context lines for display. */
4388 	memset(&cc, 0, sizeof(cc));
4389 	diff_chunk_context_load_change(&cc, nchunks_used, diff_result, n, 3);
4390 
4391 	memset(&diff_info, 0, sizeof(diff_info));
4392 	diff_info.left_path = relpath;
4393 	diff_info.right_path = relpath;
4394 
4395 	diff_state = diff_output_unidiff_state_alloc();
4396 	if (diff_state == NULL)
4397 		return got_error_set_errno(ENOMEM,
4398 		    "diff_output_unidiff_state_alloc");
4399 
4400 	hunkfile = got_opentemp();
4401 	if (hunkfile == NULL) {
4402 		err = got_error_from_errno("got_opentemp");
4403 		goto done;
4404 	}
4405 
4406 	rc = diff_output_unidiff_chunk(NULL, hunkfile, diff_state, &diff_info,
4407 	    diff_result, &cc);
4408 	if (rc != DIFF_RC_OK) {
4409 		err = got_error_set_errno(rc, "diff_output_unidiff_chunk");
4410 		goto done;
4411 	}
4412 
4413 	if (fseek(hunkfile, 0L, SEEK_SET) == -1) {
4414 		err = got_ferror(hunkfile, GOT_ERR_IO);
4415 		goto done;
4416 	}
4417 
4418 	err = (*patch_cb)(choice, patch_arg, GOT_STATUS_MODIFY, relpath,
4419 	    hunkfile, changeno, nchanges);
4420 	if (err)
4421 		goto done;
4422 
4423 	switch (*choice) {
4424 	case GOT_PATCH_CHOICE_YES:
4425 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4426 		    end_old, start_new, end_new, outfile, rejectfile);
4427 		break;
4428 	case GOT_PATCH_CHOICE_NO:
4429 		err = copy_change(f1, f2, line_cur1, line_cur2, start_old,
4430 		    end_old, start_new, end_new, rejectfile, outfile);
4431 		break;
4432 	case GOT_PATCH_CHOICE_QUIT:
4433 		break;
4434 	default:
4435 		err = got_error(GOT_ERR_PATCH_CHOICE);
4436 		break;
4437 	}
4438 done:
4439 	diff_output_unidiff_state_free(diff_state);
4440 	if (hunkfile && fclose(hunkfile) == EOF && err == NULL)
4441 		err = got_error_from_errno("fclose");
4442 	return err;
4443 }
4444 
4445 struct revert_file_args {
4446 	struct got_worktree *worktree;
4447 	struct got_fileindex *fileindex;
4448 	got_worktree_checkout_cb progress_cb;
4449 	void *progress_arg;
4450 	got_worktree_patch_cb patch_cb;
4451 	void *patch_arg;
4452 	struct got_repository *repo;
4453 	int unlink_added_files;
4454 };
4455 
4456 static const struct got_error *
4457 create_patched_content(char **path_outfile, int reverse_patch,
4458     struct got_object_id *blob_id, const char *path2,
4459     int dirfd2, const char *de_name2,
4460     const char *relpath, struct got_repository *repo,
4461     got_worktree_patch_cb patch_cb, void *patch_arg)
4462 {
4463 	const struct got_error *err, *free_err;
4464 	struct got_blob_object *blob = NULL;
4465 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL;
4466 	int fd = -1, fd2 = -1;
4467 	char link_target[PATH_MAX];
4468 	ssize_t link_len = 0;
4469 	char *path1 = NULL, *id_str = NULL;
4470 	struct stat sb2;
4471 	struct got_diffreg_result *diffreg_result = NULL;
4472 	int line_cur1 = 1, line_cur2 = 1, have_content = 0;
4473 	int i = 0, n = 0, nchunks_used = 0, nchanges = 0;
4474 
4475 	*path_outfile = NULL;
4476 
4477 	err = got_object_id_str(&id_str, blob_id);
4478 	if (err)
4479 		return err;
4480 
4481 	if (dirfd2 != -1) {
4482 		fd2 = openat(dirfd2, de_name2,
4483 		    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4484 		if (fd2 == -1) {
4485 			if (!got_err_open_nofollow_on_symlink()) {
4486 				err = got_error_from_errno2("openat", path2);
4487 				goto done;
4488 			}
4489 			link_len = readlinkat(dirfd2, de_name2,
4490 			    link_target, sizeof(link_target));
4491 			if (link_len == -1) {
4492 				return got_error_from_errno2("readlinkat",
4493 				    path2);
4494 			}
4495 			sb2.st_mode = S_IFLNK;
4496 			sb2.st_size = link_len;
4497 		}
4498 	} else {
4499 		fd2 = open(path2, O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
4500 		if (fd2 == -1) {
4501 			if (!got_err_open_nofollow_on_symlink()) {
4502 				err = got_error_from_errno2("open", path2);
4503 				goto done;
4504 			}
4505 			link_len = readlink(path2, link_target,
4506 			    sizeof(link_target));
4507 			if (link_len == -1)
4508 				return got_error_from_errno2("readlink", path2);
4509 			sb2.st_mode = S_IFLNK;
4510 			sb2.st_size = link_len;
4511 		}
4512 	}
4513 	if (fd2 != -1) {
4514 		if (fstat(fd2, &sb2) == -1) {
4515 			err = got_error_from_errno2("fstat", path2);
4516 			goto done;
4517 		}
4518 
4519 		f2 = fdopen(fd2, "r");
4520 		if (f2 == NULL) {
4521 			err = got_error_from_errno2("fdopen", path2);
4522 			goto done;
4523 		}
4524 		fd2 = -1;
4525 	} else {
4526 		size_t n;
4527 		f2 = got_opentemp();
4528 		if (f2 == NULL) {
4529 			err = got_error_from_errno2("got_opentemp", path2);
4530 			goto done;
4531 		}
4532 		n = fwrite(link_target, 1, link_len, f2);
4533 		if (n != link_len) {
4534 			err = got_ferror(f2, GOT_ERR_IO);
4535 			goto done;
4536 		}
4537 		if (fflush(f2) == EOF) {
4538 			err = got_error_from_errno("fflush");
4539 			goto done;
4540 		}
4541 		rewind(f2);
4542 	}
4543 
4544 	fd = got_opentempfd();
4545 	if (fd == -1) {
4546 		err = got_error_from_errno("got_opentempfd");
4547 		goto done;
4548 	}
4549 
4550 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd);
4551 	if (err)
4552 		goto done;
4553 
4554 	err = got_opentemp_named(&path1, &f1, "got-patched-blob", "");
4555 	if (err)
4556 		goto done;
4557 
4558 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
4559 	if (err)
4560 		goto done;
4561 
4562 	err = got_diff_files(&diffreg_result, f1, 1, id_str, f2, 1, path2,
4563 	    3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
4564 	if (err)
4565 		goto done;
4566 
4567 	err = got_opentemp_named(path_outfile, &outfile, "got-patched-content",
4568 	    "");
4569 	if (err)
4570 		goto done;
4571 
4572 	if (fseek(f1, 0L, SEEK_SET) == -1)
4573 		return got_ferror(f1, GOT_ERR_IO);
4574 	if (fseek(f2, 0L, SEEK_SET) == -1)
4575 		return got_ferror(f2, GOT_ERR_IO);
4576 
4577 	/* Count the number of actual changes in the diff result. */
4578 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4579 		struct diff_chunk_context cc = {};
4580 		diff_chunk_context_load_change(&cc, &nchunks_used,
4581 		    diffreg_result->result, n, 0);
4582 		nchanges++;
4583 	}
4584 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
4585 		int choice;
4586 		err = apply_or_reject_change(&choice, &nchunks_used,
4587 		    diffreg_result->result, n, relpath, f1, f2,
4588 		    &line_cur1, &line_cur2,
4589 		    reverse_patch ? NULL : outfile,
4590 		    reverse_patch ? outfile : NULL,
4591 		    ++i, nchanges, patch_cb, patch_arg);
4592 		if (err)
4593 			goto done;
4594 		if (choice == GOT_PATCH_CHOICE_YES)
4595 			have_content = 1;
4596 		else if (choice == GOT_PATCH_CHOICE_QUIT)
4597 			break;
4598 	}
4599 	if (have_content) {
4600 		err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
4601 		    reverse_patch ? NULL : outfile,
4602 		    reverse_patch ? outfile : NULL);
4603 		if (err)
4604 			goto done;
4605 
4606 		if (!S_ISLNK(sb2.st_mode)) {
4607 			mode_t mode;
4608 
4609 			mode = apply_umask(sb2.st_mode);
4610 			if (fchmod(fileno(outfile), mode) == -1) {
4611 				err = got_error_from_errno2("fchmod", path2);
4612 				goto done;
4613 			}
4614 		}
4615 	}
4616 done:
4617 	free(id_str);
4618 	if (fd != -1 && close(fd) == -1 && err == NULL)
4619 		err = got_error_from_errno("close");
4620 	if (blob)
4621 		got_object_blob_close(blob);
4622 	free_err = got_diffreg_result_free(diffreg_result);
4623 	if (err == NULL)
4624 		err = free_err;
4625 	if (f1 && fclose(f1) == EOF && err == NULL)
4626 		err = got_error_from_errno2("fclose", path1);
4627 	if (f2 && fclose(f2) == EOF && err == NULL)
4628 		err = got_error_from_errno2("fclose", path2);
4629 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
4630 		err = got_error_from_errno2("close", path2);
4631 	if (outfile && fclose(outfile) == EOF && err == NULL)
4632 		err = got_error_from_errno2("fclose", *path_outfile);
4633 	if (path1 && unlink(path1) == -1 && err == NULL)
4634 		err = got_error_from_errno2("unlink", path1);
4635 	if (err || !have_content) {
4636 		if (*path_outfile && unlink(*path_outfile) == -1 && err == NULL)
4637 			err = got_error_from_errno2("unlink", *path_outfile);
4638 		free(*path_outfile);
4639 		*path_outfile = NULL;
4640 	}
4641 	free(path1);
4642 	return err;
4643 }
4644 
4645 static const struct got_error *
4646 revert_file(void *arg, unsigned char status, unsigned char staged_status,
4647     const char *relpath, struct got_object_id *blob_id,
4648     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
4649     int dirfd, const char *de_name)
4650 {
4651 	struct revert_file_args *a = arg;
4652 	const struct got_error *err = NULL;
4653 	char *parent_path = NULL;
4654 	struct got_fileindex_entry *ie;
4655 	struct got_commit_object *base_commit = NULL;
4656 	struct got_tree_object *tree = NULL;
4657 	struct got_object_id *tree_id = NULL;
4658 	const struct got_tree_entry *te = NULL;
4659 	char *tree_path = NULL, *te_name;
4660 	char *ondisk_path = NULL, *path_content = NULL;
4661 	struct got_blob_object *blob = NULL;
4662 	int fd = -1;
4663 
4664 	/* Reverting a staged deletion is a no-op. */
4665 	if (status == GOT_STATUS_DELETE &&
4666 	    staged_status != GOT_STATUS_NO_CHANGE)
4667 		return NULL;
4668 
4669 	if (status == GOT_STATUS_UNVERSIONED)
4670 		return (*a->progress_cb)(a->progress_arg,
4671 		    GOT_STATUS_UNVERSIONED, relpath);
4672 
4673 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
4674 	if (ie == NULL)
4675 		return got_error_path(relpath, GOT_ERR_BAD_PATH);
4676 
4677 	/* Construct in-repository path of tree which contains this blob. */
4678 	err = got_path_dirname(&parent_path, ie->path);
4679 	if (err) {
4680 		if (err->code != GOT_ERR_BAD_PATH)
4681 			goto done;
4682 		parent_path = strdup("/");
4683 		if (parent_path == NULL) {
4684 			err = got_error_from_errno("strdup");
4685 			goto done;
4686 		}
4687 	}
4688 	if (got_path_is_root_dir(a->worktree->path_prefix)) {
4689 		tree_path = strdup(parent_path);
4690 		if (tree_path == NULL) {
4691 			err = got_error_from_errno("strdup");
4692 			goto done;
4693 		}
4694 	} else {
4695 		if (got_path_is_root_dir(parent_path)) {
4696 			tree_path = strdup(a->worktree->path_prefix);
4697 			if (tree_path == NULL) {
4698 				err = got_error_from_errno("strdup");
4699 				goto done;
4700 			}
4701 		} else {
4702 			if (asprintf(&tree_path, "%s/%s",
4703 			    a->worktree->path_prefix, parent_path) == -1) {
4704 				err = got_error_from_errno("asprintf");
4705 				goto done;
4706 			}
4707 		}
4708 	}
4709 
4710 	err = got_object_open_as_commit(&base_commit, a->repo,
4711 	    a->worktree->base_commit_id);
4712 	if (err)
4713 		goto done;
4714 
4715 	err = got_object_id_by_path(&tree_id, a->repo, base_commit, tree_path);
4716 	if (err) {
4717 		if (!(err->code == GOT_ERR_NO_TREE_ENTRY &&
4718 		    (status == GOT_STATUS_ADD ||
4719 		    staged_status == GOT_STATUS_ADD)))
4720 			goto done;
4721 	} else {
4722 		err = got_object_open_as_tree(&tree, a->repo, tree_id);
4723 		if (err)
4724 			goto done;
4725 
4726 		err = got_path_basename(&te_name, ie->path);
4727 		if (err)
4728 			goto done;
4729 
4730 		te = got_object_tree_find_entry(tree, te_name);
4731 		free(te_name);
4732 		if (te == NULL && status != GOT_STATUS_ADD &&
4733 		    staged_status != GOT_STATUS_ADD) {
4734 			err = got_error_path(ie->path, GOT_ERR_NO_TREE_ENTRY);
4735 			goto done;
4736 		}
4737 	}
4738 
4739 	switch (status) {
4740 	case GOT_STATUS_ADD:
4741 		if (a->patch_cb) {
4742 			int choice = GOT_PATCH_CHOICE_NONE;
4743 			err = (*a->patch_cb)(&choice, a->patch_arg,
4744 			    status, ie->path, NULL, 1, 1);
4745 			if (err)
4746 				goto done;
4747 			if (choice != GOT_PATCH_CHOICE_YES)
4748 				break;
4749 		}
4750 		err = (*a->progress_cb)(a->progress_arg, GOT_STATUS_REVERT,
4751 		    ie->path);
4752 		if (err)
4753 			goto done;
4754 		got_fileindex_entry_remove(a->fileindex, ie);
4755 		if (a->unlink_added_files) {
4756 			if (asprintf(&ondisk_path, "%s/%s",
4757 			    got_worktree_get_root_path(a->worktree),
4758 			    relpath) == -1) {
4759 				err = got_error_from_errno("asprintf");
4760 				goto done;
4761 			}
4762 			if (unlink(ondisk_path) == -1) {
4763 				err = got_error_from_errno2("unlink",
4764 				    ondisk_path);
4765 				break;
4766 			}
4767 		}
4768 		break;
4769 	case GOT_STATUS_DELETE:
4770 		if (a->patch_cb) {
4771 			int choice = GOT_PATCH_CHOICE_NONE;
4772 			err = (*a->patch_cb)(&choice, a->patch_arg,
4773 			    status, ie->path, NULL, 1, 1);
4774 			if (err)
4775 				goto done;
4776 			if (choice != GOT_PATCH_CHOICE_YES)
4777 				break;
4778 		}
4779 		/* fall through */
4780 	case GOT_STATUS_MODIFY:
4781 	case GOT_STATUS_MODE_CHANGE:
4782 	case GOT_STATUS_CONFLICT:
4783 	case GOT_STATUS_MISSING: {
4784 		struct got_object_id id;
4785 		if (staged_status == GOT_STATUS_ADD ||
4786 		    staged_status == GOT_STATUS_MODIFY) {
4787 			memcpy(id.sha1, ie->staged_blob_sha1,
4788 			    SHA1_DIGEST_LENGTH);
4789 		} else
4790 			memcpy(id.sha1, ie->blob_sha1,
4791 			    SHA1_DIGEST_LENGTH);
4792 		fd = got_opentempfd();
4793 		if (fd == -1) {
4794 			err = got_error_from_errno("got_opentempfd");
4795 			goto done;
4796 		}
4797 
4798 		err = got_object_open_as_blob(&blob, a->repo, &id, 8192, fd);
4799 		if (err)
4800 			goto done;
4801 
4802 		if (asprintf(&ondisk_path, "%s/%s",
4803 		    got_worktree_get_root_path(a->worktree), relpath) == -1) {
4804 			err = got_error_from_errno("asprintf");
4805 			goto done;
4806 		}
4807 
4808 		if (a->patch_cb && (status == GOT_STATUS_MODIFY ||
4809 		    status == GOT_STATUS_CONFLICT)) {
4810 			int is_bad_symlink = 0;
4811 			err = create_patched_content(&path_content, 1, &id,
4812 			    ondisk_path, dirfd, de_name, ie->path, a->repo,
4813 			    a->patch_cb, a->patch_arg);
4814 			if (err || path_content == NULL)
4815 				break;
4816 			if (te && S_ISLNK(te->mode)) {
4817 				if (unlink(path_content) == -1) {
4818 					err = got_error_from_errno2("unlink",
4819 					    path_content);
4820 					break;
4821 				}
4822 				err = install_symlink(&is_bad_symlink,
4823 				    a->worktree, ondisk_path, ie->path,
4824 				    blob, 0, 1, 0, 0, a->repo,
4825 				    a->progress_cb, a->progress_arg);
4826 			} else {
4827 				if (rename(path_content, ondisk_path) == -1) {
4828 					err = got_error_from_errno3("rename",
4829 					    path_content, ondisk_path);
4830 					goto done;
4831 				}
4832 			}
4833 		} else {
4834 			int is_bad_symlink = 0;
4835 			if (te && S_ISLNK(te->mode)) {
4836 				err = install_symlink(&is_bad_symlink,
4837 				    a->worktree, ondisk_path, ie->path,
4838 				    blob, 0, 1, 0, 0, a->repo,
4839 				    a->progress_cb, a->progress_arg);
4840 			} else {
4841 				err = install_blob(a->worktree, ondisk_path,
4842 				    ie->path,
4843 				    te ? te->mode : GOT_DEFAULT_FILE_MODE,
4844 				    got_fileindex_perms_to_st(ie), blob,
4845 				    0, 1, 0, 0, a->repo,
4846 				    a->progress_cb, a->progress_arg);
4847 			}
4848 			if (err)
4849 				goto done;
4850 			if (status == GOT_STATUS_DELETE ||
4851 			    status == GOT_STATUS_MODE_CHANGE) {
4852 				err = got_fileindex_entry_update(ie,
4853 				    a->worktree->root_fd, relpath,
4854 				    blob->id.sha1,
4855 				    a->worktree->base_commit_id->sha1, 1);
4856 				if (err)
4857 					goto done;
4858 			}
4859 			if (is_bad_symlink) {
4860 				got_fileindex_entry_filetype_set(ie,
4861 				    GOT_FILEIDX_MODE_BAD_SYMLINK);
4862 			}
4863 		}
4864 		break;
4865 	}
4866 	default:
4867 		break;
4868 	}
4869 done:
4870 	free(ondisk_path);
4871 	free(path_content);
4872 	free(parent_path);
4873 	free(tree_path);
4874 	if (fd != -1 && close(fd) == -1 && err == NULL)
4875 		err = got_error_from_errno("close");
4876 	if (blob)
4877 		got_object_blob_close(blob);
4878 	if (tree)
4879 		got_object_tree_close(tree);
4880 	free(tree_id);
4881 	if (base_commit)
4882 		got_object_commit_close(base_commit);
4883 	return err;
4884 }
4885 
4886 const struct got_error *
4887 got_worktree_revert(struct got_worktree *worktree,
4888     struct got_pathlist_head *paths,
4889     got_worktree_checkout_cb progress_cb, void *progress_arg,
4890     got_worktree_patch_cb patch_cb, void *patch_arg,
4891     struct got_repository *repo)
4892 {
4893 	struct got_fileindex *fileindex = NULL;
4894 	char *fileindex_path = NULL;
4895 	const struct got_error *err = NULL, *unlockerr = NULL;
4896 	const struct got_error *sync_err = NULL;
4897 	struct got_pathlist_entry *pe;
4898 	struct revert_file_args rfa;
4899 
4900 	err = lock_worktree(worktree, LOCK_EX);
4901 	if (err)
4902 		return err;
4903 
4904 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
4905 	if (err)
4906 		goto done;
4907 
4908 	rfa.worktree = worktree;
4909 	rfa.fileindex = fileindex;
4910 	rfa.progress_cb = progress_cb;
4911 	rfa.progress_arg = progress_arg;
4912 	rfa.patch_cb = patch_cb;
4913 	rfa.patch_arg = patch_arg;
4914 	rfa.repo = repo;
4915 	rfa.unlink_added_files = 0;
4916 	TAILQ_FOREACH(pe, paths, entry) {
4917 		err = worktree_status(worktree, pe->path, fileindex, repo,
4918 		    revert_file, &rfa, NULL, NULL, 1, 0);
4919 		if (err)
4920 			break;
4921 	}
4922 	sync_err = sync_fileindex(fileindex, fileindex_path);
4923 	if (sync_err && err == NULL)
4924 		err = sync_err;
4925 done:
4926 	free(fileindex_path);
4927 	if (fileindex)
4928 		got_fileindex_free(fileindex);
4929 	unlockerr = lock_worktree(worktree, LOCK_SH);
4930 	if (unlockerr && err == NULL)
4931 		err = unlockerr;
4932 	return err;
4933 }
4934 
4935 static void
4936 free_commitable(struct got_commitable *ct)
4937 {
4938 	free(ct->path);
4939 	free(ct->in_repo_path);
4940 	free(ct->ondisk_path);
4941 	free(ct->blob_id);
4942 	free(ct->base_blob_id);
4943 	free(ct->staged_blob_id);
4944 	free(ct->base_commit_id);
4945 	free(ct);
4946 }
4947 
4948 struct collect_commitables_arg {
4949 	struct got_pathlist_head *commitable_paths;
4950 	struct got_repository *repo;
4951 	struct got_worktree *worktree;
4952 	struct got_fileindex *fileindex;
4953 	int have_staged_files;
4954 	int allow_bad_symlinks;
4955 	int diff_header_shown;
4956 	FILE *diff_outfile;
4957 	FILE *f1;
4958 	FILE *f2;
4959 };
4960 
4961 /*
4962  * Create a file which contains the target path of a symlink so we can feed
4963  * it as content to the diff engine.
4964  */
4965 static const struct got_error *
4966 get_symlink_target_file(int *fd, int dirfd, const char *de_name,
4967     const char *abspath)
4968 {
4969 	const struct got_error *err = NULL;
4970 	char target_path[PATH_MAX];
4971 	ssize_t target_len, outlen;
4972 
4973 	*fd = -1;
4974 
4975 	if (dirfd != -1) {
4976 		target_len = readlinkat(dirfd, de_name, target_path, PATH_MAX);
4977 		if (target_len == -1)
4978 			return got_error_from_errno2("readlinkat", abspath);
4979 	} else {
4980 		target_len = readlink(abspath, target_path, PATH_MAX);
4981 		if (target_len == -1)
4982 			return got_error_from_errno2("readlink", abspath);
4983 	}
4984 
4985 	*fd = got_opentempfd();
4986 	if (*fd == -1)
4987 		return got_error_from_errno("got_opentempfd");
4988 
4989 	outlen = write(*fd, target_path, target_len);
4990 	if (outlen == -1) {
4991 		err = got_error_from_errno("got_opentempfd");
4992 		goto done;
4993 	}
4994 
4995 	if (lseek(*fd, 0, SEEK_SET) == -1) {
4996 		err = got_error_from_errno2("lseek", abspath);
4997 		goto done;
4998 	}
4999 done:
5000 	if (err) {
5001 		close(*fd);
5002 		*fd = -1;
5003 	}
5004 	return err;
5005 }
5006 
5007 static const struct got_error *
5008 append_ct_diff(struct got_commitable *ct, int *diff_header_shown,
5009     FILE *diff_outfile, FILE *f1, FILE *f2, int dirfd, const char *de_name,
5010     int diff_staged, struct got_repository *repo, struct got_worktree *worktree)
5011 {
5012 	const struct got_error *err = NULL;
5013 	struct got_blob_object *blob1 = NULL;
5014 	int fd = -1, fd1 = -1, fd2 = -1;
5015 	FILE *ondisk_file = NULL;
5016 	char *label1 = NULL;
5017 	struct stat sb;
5018 	off_t size1 = 0;
5019 	int f2_exists = 0;
5020 	char *id_str = NULL;
5021 
5022 	memset(&sb, 0, sizeof(sb));
5023 
5024 	err = got_opentemp_truncate(f1);
5025 	if (err)
5026 		return got_error_from_errno("got_opentemp_truncate");
5027 	err = got_opentemp_truncate(f2);
5028 	if (err)
5029 		return got_error_from_errno("got_opentemp_truncate");
5030 
5031 	if (!*diff_header_shown) {
5032 		err = got_object_id_str(&id_str, worktree->base_commit_id);
5033 		if (err)
5034 			return err;
5035 		fprintf(diff_outfile, "diff %s%s\n", diff_staged ? "-s " : "",
5036 		    got_worktree_get_root_path(worktree));
5037 		fprintf(diff_outfile, "commit - %s\n", id_str);
5038 		fprintf(diff_outfile, "path + %s%s\n",
5039 		    got_worktree_get_root_path(worktree),
5040 		    diff_staged ? " (staged changes)" : "");
5041 		*diff_header_shown = 1;
5042 	}
5043 
5044 	if (diff_staged) {
5045 		const char *label1 = NULL, *label2 = NULL;
5046 		switch (ct->staged_status) {
5047 		case GOT_STATUS_MODIFY:
5048 			label1 = ct->path;
5049 			label2 = ct->path;
5050 			break;
5051 		case GOT_STATUS_ADD:
5052 			label2 = ct->path;
5053 			break;
5054 		case GOT_STATUS_DELETE:
5055 			label1 = ct->path;
5056 			break;
5057 		default:
5058 			return got_error(GOT_ERR_FILE_STATUS);
5059 		}
5060 		fd1 = got_opentempfd();
5061 		if (fd1 == -1) {
5062 			err = got_error_from_errno("got_opentempfd");
5063 			goto done;
5064 		}
5065 		fd2 = got_opentempfd();
5066 		if (fd2 == -1) {
5067 			err = got_error_from_errno("got_opentempfd");
5068 			goto done;
5069 		}
5070 		err = got_diff_objects_as_blobs(NULL, NULL, f1, f2,
5071 		    fd1, fd2, ct->base_blob_id, ct->staged_blob_id,
5072 		    label1, label2, GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0,
5073 		    repo, diff_outfile);
5074 		goto done;
5075 	}
5076 
5077 	fd1 = got_opentempfd();
5078 	if (fd1 == -1) {
5079 		err = got_error_from_errno("got_opentempfd");
5080 		goto done;
5081 	}
5082 
5083 	if (ct->status != GOT_STATUS_ADD) {
5084 		err = got_object_open_as_blob(&blob1, repo, ct->base_blob_id,
5085 		    8192, fd1);
5086 		if (err)
5087 			goto done;
5088 	}
5089 
5090 	if (ct->status != GOT_STATUS_DELETE) {
5091 		if (dirfd != -1) {
5092 			fd = openat(dirfd, de_name,
5093 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5094 			if (fd == -1) {
5095 				if (!got_err_open_nofollow_on_symlink()) {
5096 					err = got_error_from_errno2("openat",
5097 					    ct->ondisk_path);
5098 					goto done;
5099 				}
5100 				err = get_symlink_target_file(&fd, dirfd,
5101 				    de_name, ct->ondisk_path);
5102 				if (err)
5103 					goto done;
5104 			}
5105 		} else {
5106 			fd = open(ct->ondisk_path,
5107 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
5108 			if (fd == -1) {
5109 				if (!got_err_open_nofollow_on_symlink()) {
5110 					err = got_error_from_errno2("open",
5111 					    ct->ondisk_path);
5112 					goto done;
5113 				}
5114 				err = get_symlink_target_file(&fd, dirfd,
5115 				    de_name, ct->ondisk_path);
5116 				if (err)
5117 					goto done;
5118 			}
5119 		}
5120 		if (fstatat(fd, ct->ondisk_path, &sb,
5121 		    AT_SYMLINK_NOFOLLOW) == -1) {
5122 			err = got_error_from_errno2("fstatat", ct->ondisk_path);
5123 			goto done;
5124 		}
5125 		ondisk_file = fdopen(fd, "r");
5126 		if (ondisk_file == NULL) {
5127 			err = got_error_from_errno2("fdopen", ct->ondisk_path);
5128 			goto done;
5129 		}
5130 		fd = -1;
5131 		f2_exists = 1;
5132 	}
5133 
5134 	if (blob1) {
5135 		err = got_object_blob_dump_to_file(&size1, NULL, NULL,
5136 		    f1, blob1);
5137 		if (err)
5138 			goto done;
5139 	}
5140 
5141 	err = got_diff_blob_file(blob1, f1, size1, label1,
5142 	    ondisk_file ? ondisk_file : f2, f2_exists, &sb, ct->path,
5143 	    GOT_DIFF_ALGORITHM_PATIENCE, 3, 0, 0, diff_outfile);
5144 done:
5145 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
5146 		err = got_error_from_errno("close");
5147 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
5148 		err = got_error_from_errno("close");
5149 	if (blob1)
5150 		got_object_blob_close(blob1);
5151 	if (fd != -1 && close(fd) == -1 && err == NULL)
5152 		err = got_error_from_errno("close");
5153 	if (ondisk_file && fclose(ondisk_file) == EOF && err == NULL)
5154 		err = got_error_from_errno("fclose");
5155 	return err;
5156 }
5157 
5158 static const struct got_error *
5159 collect_commitables(void *arg, unsigned char status,
5160     unsigned char staged_status, const char *relpath,
5161     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
5162     struct got_object_id *commit_id, int dirfd, const char *de_name)
5163 {
5164 	struct collect_commitables_arg *a = arg;
5165 	const struct got_error *err = NULL;
5166 	struct got_commitable *ct = NULL;
5167 	struct got_pathlist_entry *new = NULL;
5168 	char *parent_path = NULL, *path = NULL;
5169 	struct stat sb;
5170 
5171 	if (a->have_staged_files) {
5172 		if (staged_status != GOT_STATUS_MODIFY &&
5173 		    staged_status != GOT_STATUS_ADD &&
5174 		    staged_status != GOT_STATUS_DELETE)
5175 			return NULL;
5176 	} else {
5177 		if (status == GOT_STATUS_CONFLICT)
5178 			return got_error(GOT_ERR_COMMIT_CONFLICT);
5179 
5180 		if (status != GOT_STATUS_MODIFY &&
5181 		    status != GOT_STATUS_MODE_CHANGE &&
5182 		    status != GOT_STATUS_ADD &&
5183 		    status != GOT_STATUS_DELETE)
5184 			return NULL;
5185 	}
5186 
5187 	if (asprintf(&path, "/%s", relpath) == -1) {
5188 		err = got_error_from_errno("asprintf");
5189 		goto done;
5190 	}
5191 	if (strcmp(path, "/") == 0) {
5192 		parent_path = strdup("");
5193 		if (parent_path == NULL)
5194 			return got_error_from_errno("strdup");
5195 	} else {
5196 		err = got_path_dirname(&parent_path, path);
5197 		if (err)
5198 			return err;
5199 	}
5200 
5201 	ct = calloc(1, sizeof(*ct));
5202 	if (ct == NULL) {
5203 		err = got_error_from_errno("calloc");
5204 		goto done;
5205 	}
5206 
5207 	if (asprintf(&ct->ondisk_path, "%s/%s", a->worktree->root_path,
5208 	    relpath) == -1) {
5209 		err = got_error_from_errno("asprintf");
5210 		goto done;
5211 	}
5212 
5213 	if (staged_status == GOT_STATUS_ADD ||
5214 	    staged_status == GOT_STATUS_MODIFY) {
5215 		struct got_fileindex_entry *ie;
5216 		ie = got_fileindex_entry_get(a->fileindex, path, strlen(path));
5217 		switch (got_fileindex_entry_staged_filetype_get(ie)) {
5218 		case GOT_FILEIDX_MODE_REGULAR_FILE:
5219 		case GOT_FILEIDX_MODE_BAD_SYMLINK:
5220 			ct->mode = S_IFREG;
5221 			break;
5222 		case GOT_FILEIDX_MODE_SYMLINK:
5223 			ct->mode = S_IFLNK;
5224 			break;
5225 		default:
5226 			err = got_error_path(path, GOT_ERR_BAD_FILETYPE);
5227 			goto done;
5228 		}
5229 		ct->mode |= got_fileindex_entry_perms_get(ie);
5230 	} else if (status != GOT_STATUS_DELETE &&
5231 	    staged_status != GOT_STATUS_DELETE) {
5232 		if (dirfd != -1) {
5233 			if (fstatat(dirfd, de_name, &sb,
5234 			    AT_SYMLINK_NOFOLLOW) == -1) {
5235 				err = got_error_from_errno2("fstatat",
5236 				    ct->ondisk_path);
5237 				goto done;
5238 			}
5239 		} else if (lstat(ct->ondisk_path, &sb) == -1) {
5240 			err = got_error_from_errno2("lstat", ct->ondisk_path);
5241 			goto done;
5242 		}
5243 		ct->mode = sb.st_mode;
5244 	}
5245 
5246 	if (asprintf(&ct->in_repo_path, "%s%s%s", a->worktree->path_prefix,
5247 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
5248 	    relpath) == -1) {
5249 		err = got_error_from_errno("asprintf");
5250 		goto done;
5251 	}
5252 
5253 	if (S_ISLNK(ct->mode) && staged_status == GOT_STATUS_NO_CHANGE &&
5254 	    status == GOT_STATUS_ADD && !a->allow_bad_symlinks) {
5255 		int is_bad_symlink;
5256 		char target_path[PATH_MAX];
5257 		ssize_t target_len;
5258 		target_len = readlink(ct->ondisk_path, target_path,
5259 		    sizeof(target_path));
5260 		if (target_len == -1) {
5261 			err = got_error_from_errno2("readlink",
5262 			    ct->ondisk_path);
5263 			goto done;
5264 		}
5265 		err = is_bad_symlink_target(&is_bad_symlink, target_path,
5266 		    target_len, ct->ondisk_path, a->worktree->root_path);
5267 		if (err)
5268 			goto done;
5269 		if (is_bad_symlink) {
5270 			err = got_error_path(ct->ondisk_path,
5271 			    GOT_ERR_BAD_SYMLINK);
5272 			goto done;
5273 		}
5274 	}
5275 
5276 
5277 	ct->status = status;
5278 	ct->staged_status = staged_status;
5279 	ct->blob_id = NULL; /* will be filled in when blob gets created */
5280 	if (ct->status != GOT_STATUS_ADD &&
5281 	    ct->staged_status != GOT_STATUS_ADD) {
5282 		ct->base_blob_id = got_object_id_dup(blob_id);
5283 		if (ct->base_blob_id == NULL) {
5284 			err = got_error_from_errno("got_object_id_dup");
5285 			goto done;
5286 		}
5287 		ct->base_commit_id = got_object_id_dup(commit_id);
5288 		if (ct->base_commit_id == NULL) {
5289 			err = got_error_from_errno("got_object_id_dup");
5290 			goto done;
5291 		}
5292 	}
5293 	if (ct->staged_status == GOT_STATUS_ADD ||
5294 	    ct->staged_status == GOT_STATUS_MODIFY) {
5295 		ct->staged_blob_id = got_object_id_dup(staged_blob_id);
5296 		if (ct->staged_blob_id == NULL) {
5297 			err = got_error_from_errno("got_object_id_dup");
5298 			goto done;
5299 		}
5300 	}
5301 	ct->path = strdup(path);
5302 	if (ct->path == NULL) {
5303 		err = got_error_from_errno("strdup");
5304 		goto done;
5305 	}
5306 	err = got_pathlist_insert(&new, a->commitable_paths, ct->path, ct);
5307 	if (err)
5308 		goto done;
5309 
5310 	if (a->diff_outfile && ct && new != NULL) {
5311 		err = append_ct_diff(ct, &a->diff_header_shown,
5312 		    a->diff_outfile, a->f1, a->f2, dirfd, de_name,
5313 		    a->have_staged_files, a->repo, a->worktree);
5314 		if (err)
5315 			goto done;
5316 	}
5317 done:
5318 	if (ct && (err || new == NULL))
5319 		free_commitable(ct);
5320 	free(parent_path);
5321 	free(path);
5322 	return err;
5323 }
5324 
5325 static const struct got_error *write_tree(struct got_object_id **, int *,
5326     struct got_tree_object *, const char *, struct got_pathlist_head *,
5327     got_worktree_status_cb status_cb, void *status_arg,
5328     struct got_repository *);
5329 
5330 static const struct got_error *
5331 write_subtree(struct got_object_id **new_subtree_id, int *nentries,
5332     struct got_tree_entry *te, const char *parent_path,
5333     struct got_pathlist_head *commitable_paths,
5334     got_worktree_status_cb status_cb, void *status_arg,
5335     struct got_repository *repo)
5336 {
5337 	const struct got_error *err = NULL;
5338 	struct got_tree_object *subtree;
5339 	char *subpath;
5340 
5341 	if (asprintf(&subpath, "%s%s%s", parent_path,
5342 	    got_path_is_root_dir(parent_path) ? "" : "/", te->name) == -1)
5343 		return got_error_from_errno("asprintf");
5344 
5345 	err = got_object_open_as_tree(&subtree, repo, &te->id);
5346 	if (err)
5347 		return err;
5348 
5349 	err = write_tree(new_subtree_id, nentries, subtree, subpath,
5350 	    commitable_paths, status_cb, status_arg, repo);
5351 	got_object_tree_close(subtree);
5352 	free(subpath);
5353 	return err;
5354 }
5355 
5356 static const struct got_error *
5357 match_ct_parent_path(int *match, struct got_commitable *ct, const char *path)
5358 {
5359 	const struct got_error *err = NULL;
5360 	char *ct_parent_path = NULL;
5361 
5362 	*match = 0;
5363 
5364 	if (strchr(ct->in_repo_path, '/') == NULL) {
5365 		*match = got_path_is_root_dir(path);
5366 		return NULL;
5367 	}
5368 
5369 	err = got_path_dirname(&ct_parent_path, ct->in_repo_path);
5370 	if (err)
5371 		return err;
5372 	*match = (strcmp(path, ct_parent_path) == 0);
5373 	free(ct_parent_path);
5374 	return err;
5375 }
5376 
5377 static mode_t
5378 get_ct_file_mode(struct got_commitable *ct)
5379 {
5380 	if (S_ISLNK(ct->mode))
5381 		return S_IFLNK;
5382 
5383 	return S_IFREG | (ct->mode & ((S_IRWXU | S_IRWXG | S_IRWXO)));
5384 }
5385 
5386 static const struct got_error *
5387 alloc_modified_blob_tree_entry(struct got_tree_entry **new_te,
5388     struct got_tree_entry *te, struct got_commitable *ct)
5389 {
5390 	const struct got_error *err = NULL;
5391 
5392 	*new_te = NULL;
5393 
5394 	err = got_object_tree_entry_dup(new_te, te);
5395 	if (err)
5396 		goto done;
5397 
5398 	(*new_te)->mode = get_ct_file_mode(ct);
5399 
5400 	if (ct->staged_status == GOT_STATUS_MODIFY)
5401 		memcpy(&(*new_te)->id, ct->staged_blob_id,
5402 		    sizeof((*new_te)->id));
5403 	else
5404 		memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5405 done:
5406 	if (err && *new_te) {
5407 		free(*new_te);
5408 		*new_te = NULL;
5409 	}
5410 	return err;
5411 }
5412 
5413 static const struct got_error *
5414 alloc_added_blob_tree_entry(struct got_tree_entry **new_te,
5415     struct got_commitable *ct)
5416 {
5417 	const struct got_error *err = NULL;
5418 	char *ct_name = NULL;
5419 
5420 	 *new_te = NULL;
5421 
5422 	*new_te = calloc(1, sizeof(**new_te));
5423 	if (*new_te == NULL)
5424 		return got_error_from_errno("calloc");
5425 
5426 	err = got_path_basename(&ct_name, ct->path);
5427 	if (err)
5428 		goto done;
5429 	if (strlcpy((*new_te)->name, ct_name, sizeof((*new_te)->name)) >=
5430 	    sizeof((*new_te)->name)) {
5431 		err = got_error(GOT_ERR_NO_SPACE);
5432 		goto done;
5433 	}
5434 
5435 	(*new_te)->mode = get_ct_file_mode(ct);
5436 
5437 	if (ct->staged_status == GOT_STATUS_ADD)
5438 		memcpy(&(*new_te)->id, ct->staged_blob_id,
5439 		    sizeof((*new_te)->id));
5440 	else
5441 		memcpy(&(*new_te)->id, ct->blob_id, sizeof((*new_te)->id));
5442 done:
5443 	free(ct_name);
5444 	if (err && *new_te) {
5445 		free(*new_te);
5446 		*new_te = NULL;
5447 	}
5448 	return err;
5449 }
5450 
5451 static const struct got_error *
5452 insert_tree_entry(struct got_tree_entry *new_te,
5453     struct got_pathlist_head *paths)
5454 {
5455 	const struct got_error *err = NULL;
5456 	struct got_pathlist_entry *new_pe;
5457 
5458 	err = got_pathlist_insert(&new_pe, paths, new_te->name, new_te);
5459 	if (err)
5460 		return err;
5461 	if (new_pe == NULL)
5462 		return got_error(GOT_ERR_TREE_DUP_ENTRY);
5463 	return NULL;
5464 }
5465 
5466 static const struct got_error *
5467 report_ct_status(struct got_commitable *ct,
5468     got_worktree_status_cb status_cb, void *status_arg)
5469 {
5470 	const char *ct_path = ct->path;
5471 	unsigned char status;
5472 
5473 	if (status_cb == NULL) /* no commit progress output desired */
5474 		return NULL;
5475 
5476 	while (ct_path[0] == '/')
5477 		ct_path++;
5478 
5479 	if (ct->staged_status != GOT_STATUS_NO_CHANGE)
5480 		status = ct->staged_status;
5481 	else
5482 		status = ct->status;
5483 
5484 	return (*status_cb)(status_arg, status, GOT_STATUS_NO_CHANGE,
5485 	    ct_path, ct->blob_id, NULL, NULL, -1, NULL);
5486 }
5487 
5488 static const struct got_error *
5489 match_modified_subtree(int *modified, struct got_tree_entry *te,
5490     const char *base_tree_path, struct got_pathlist_head *commitable_paths)
5491 {
5492 	const struct got_error *err = NULL;
5493 	struct got_pathlist_entry *pe;
5494 	char *te_path;
5495 
5496 	*modified = 0;
5497 
5498 	if (asprintf(&te_path, "%s%s%s", base_tree_path,
5499 	    got_path_is_root_dir(base_tree_path) ? "" : "/",
5500 	    te->name) == -1)
5501 		return got_error_from_errno("asprintf");
5502 
5503 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5504 		struct got_commitable *ct = pe->data;
5505 		*modified = got_path_is_child(ct->in_repo_path, te_path,
5506 		    strlen(te_path));
5507 		if (*modified)
5508 			break;
5509 	}
5510 
5511 	free(te_path);
5512 	return err;
5513 }
5514 
5515 static const struct got_error *
5516 match_deleted_or_modified_ct(struct got_commitable **ctp,
5517     struct got_tree_entry *te, const char *base_tree_path,
5518     struct got_pathlist_head *commitable_paths)
5519 {
5520 	const struct got_error *err = NULL;
5521 	struct got_pathlist_entry *pe;
5522 
5523 	*ctp = NULL;
5524 
5525 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5526 		struct got_commitable *ct = pe->data;
5527 		char *ct_name = NULL;
5528 		int path_matches;
5529 
5530 		if (ct->staged_status == GOT_STATUS_NO_CHANGE) {
5531 			if (ct->status != GOT_STATUS_MODIFY &&
5532 			    ct->status != GOT_STATUS_MODE_CHANGE &&
5533 			    ct->status != GOT_STATUS_DELETE)
5534 				continue;
5535 		} else {
5536 			if (ct->staged_status != GOT_STATUS_MODIFY &&
5537 			    ct->staged_status != GOT_STATUS_DELETE)
5538 				continue;
5539 		}
5540 
5541 		if (got_object_id_cmp(ct->base_blob_id, &te->id) != 0)
5542 			continue;
5543 
5544 		err = match_ct_parent_path(&path_matches, ct, base_tree_path);
5545 		if (err)
5546 			return err;
5547 		if (!path_matches)
5548 			continue;
5549 
5550 		err = got_path_basename(&ct_name, pe->path);
5551 		if (err)
5552 			return err;
5553 
5554 		if (strcmp(te->name, ct_name) != 0) {
5555 			free(ct_name);
5556 			continue;
5557 		}
5558 		free(ct_name);
5559 
5560 		*ctp = ct;
5561 		break;
5562 	}
5563 
5564 	return err;
5565 }
5566 
5567 static const struct got_error *
5568 make_subtree_for_added_blob(struct got_tree_entry **new_tep,
5569     const char *child_path, const char *path_base_tree,
5570     struct got_pathlist_head *commitable_paths,
5571     got_worktree_status_cb status_cb, void *status_arg,
5572     struct got_repository *repo)
5573 {
5574 	const struct got_error *err = NULL;
5575 	struct got_tree_entry *new_te;
5576 	char *subtree_path;
5577 	struct got_object_id *id = NULL;
5578 	int nentries;
5579 
5580 	*new_tep = NULL;
5581 
5582 	if (asprintf(&subtree_path, "%s%s%s", path_base_tree,
5583 	    got_path_is_root_dir(path_base_tree) ? "" : "/",
5584 	    child_path) == -1)
5585 		return got_error_from_errno("asprintf");
5586 
5587 	new_te = calloc(1, sizeof(*new_te));
5588 	if (new_te == NULL)
5589 		return got_error_from_errno("calloc");
5590 	new_te->mode = S_IFDIR;
5591 
5592 	if (strlcpy(new_te->name, child_path, sizeof(new_te->name)) >=
5593 	    sizeof(new_te->name)) {
5594 		err = got_error(GOT_ERR_NO_SPACE);
5595 		goto done;
5596 	}
5597 	err = write_tree(&id, &nentries, NULL, subtree_path,
5598 	    commitable_paths, status_cb, status_arg, repo);
5599 	if (err) {
5600 		free(new_te);
5601 		goto done;
5602 	}
5603 	memcpy(&new_te->id, id, sizeof(new_te->id));
5604 done:
5605 	free(id);
5606 	free(subtree_path);
5607 	if (err == NULL)
5608 		*new_tep = new_te;
5609 	return err;
5610 }
5611 
5612 static const struct got_error *
5613 write_tree(struct got_object_id **new_tree_id, int *nentries,
5614     struct got_tree_object *base_tree, const char *path_base_tree,
5615     struct got_pathlist_head *commitable_paths,
5616     got_worktree_status_cb status_cb, void *status_arg,
5617     struct got_repository *repo)
5618 {
5619 	const struct got_error *err = NULL;
5620 	struct got_pathlist_head paths;
5621 	struct got_tree_entry *te, *new_te = NULL;
5622 	struct got_pathlist_entry *pe;
5623 
5624 	TAILQ_INIT(&paths);
5625 	*nentries = 0;
5626 
5627 	/* Insert, and recurse into, newly added entries first. */
5628 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5629 		struct got_commitable *ct = pe->data;
5630 		char *child_path = NULL, *slash;
5631 
5632 		if ((ct->status != GOT_STATUS_ADD &&
5633 		    ct->staged_status != GOT_STATUS_ADD) ||
5634 		    (ct->flags & GOT_COMMITABLE_ADDED))
5635 			continue;
5636 
5637 		if (!got_path_is_child(ct->in_repo_path, path_base_tree,
5638 		    strlen(path_base_tree)))
5639 			continue;
5640 
5641 		err = got_path_skip_common_ancestor(&child_path, path_base_tree,
5642 		    ct->in_repo_path);
5643 		if (err)
5644 			goto done;
5645 
5646 		slash = strchr(child_path, '/');
5647 		if (slash == NULL) {
5648 			err = alloc_added_blob_tree_entry(&new_te, ct);
5649 			if (err)
5650 				goto done;
5651 			err = report_ct_status(ct, status_cb, status_arg);
5652 			if (err)
5653 				goto done;
5654 			ct->flags |= GOT_COMMITABLE_ADDED;
5655 			err = insert_tree_entry(new_te, &paths);
5656 			if (err)
5657 				goto done;
5658 			(*nentries)++;
5659 		} else {
5660 			*slash = '\0'; /* trim trailing path components */
5661 			if (base_tree == NULL ||
5662 			    got_object_tree_find_entry(base_tree, child_path)
5663 			    == NULL) {
5664 				err = make_subtree_for_added_blob(&new_te,
5665 				    child_path, path_base_tree,
5666 				    commitable_paths, status_cb, status_arg,
5667 				    repo);
5668 				if (err)
5669 					goto done;
5670 				err = insert_tree_entry(new_te, &paths);
5671 				if (err)
5672 					goto done;
5673 				(*nentries)++;
5674 			}
5675 		}
5676 	}
5677 
5678 	if (base_tree) {
5679 		int i, nbase_entries;
5680 		/* Handle modified and deleted entries. */
5681 		nbase_entries = got_object_tree_get_nentries(base_tree);
5682 		for (i = 0; i < nbase_entries; i++) {
5683 			struct got_commitable *ct = NULL;
5684 
5685 			te = got_object_tree_get_entry(base_tree, i);
5686 			if (got_object_tree_entry_is_submodule(te)) {
5687 				/* Entry is a submodule; just copy it. */
5688 				err = got_object_tree_entry_dup(&new_te, te);
5689 				if (err)
5690 					goto done;
5691 				err = insert_tree_entry(new_te, &paths);
5692 				if (err)
5693 					goto done;
5694 				(*nentries)++;
5695 				continue;
5696 			}
5697 
5698 			if (S_ISDIR(te->mode)) {
5699 				int modified;
5700 				err = got_object_tree_entry_dup(&new_te, te);
5701 				if (err)
5702 					goto done;
5703 				err = match_modified_subtree(&modified, te,
5704 				    path_base_tree, commitable_paths);
5705 				if (err)
5706 					goto done;
5707 				/* Avoid recursion into unmodified subtrees. */
5708 				if (modified) {
5709 					struct got_object_id *new_id;
5710 					int nsubentries;
5711 					err = write_subtree(&new_id,
5712 					    &nsubentries, te,
5713 					    path_base_tree, commitable_paths,
5714 					    status_cb, status_arg, repo);
5715 					if (err)
5716 						goto done;
5717 					if (nsubentries == 0) {
5718 						/* All entries were deleted. */
5719 						free(new_id);
5720 						continue;
5721 					}
5722 					memcpy(&new_te->id, new_id,
5723 					    sizeof(new_te->id));
5724 					free(new_id);
5725 				}
5726 				err = insert_tree_entry(new_te, &paths);
5727 				if (err)
5728 					goto done;
5729 				(*nentries)++;
5730 				continue;
5731 			}
5732 
5733 			err = match_deleted_or_modified_ct(&ct, te,
5734 			    path_base_tree, commitable_paths);
5735 			if (err)
5736 				goto done;
5737 			if (ct) {
5738 				/* NB: Deleted entries get dropped here. */
5739 				if (ct->status == GOT_STATUS_MODIFY ||
5740 				    ct->status == GOT_STATUS_MODE_CHANGE ||
5741 				    ct->staged_status == GOT_STATUS_MODIFY) {
5742 					err = alloc_modified_blob_tree_entry(
5743 					    &new_te, te, ct);
5744 					if (err)
5745 						goto done;
5746 					err = insert_tree_entry(new_te, &paths);
5747 					if (err)
5748 						goto done;
5749 					(*nentries)++;
5750 				}
5751 				err = report_ct_status(ct, status_cb,
5752 				    status_arg);
5753 				if (err)
5754 					goto done;
5755 			} else {
5756 				/* Entry is unchanged; just copy it. */
5757 				err = got_object_tree_entry_dup(&new_te, te);
5758 				if (err)
5759 					goto done;
5760 				err = insert_tree_entry(new_te, &paths);
5761 				if (err)
5762 					goto done;
5763 				(*nentries)++;
5764 			}
5765 		}
5766 	}
5767 
5768 	/* Write new list of entries; deleted entries have been dropped. */
5769 	err = got_object_tree_create(new_tree_id, &paths, *nentries, repo);
5770 done:
5771 	got_pathlist_free(&paths);
5772 	return err;
5773 }
5774 
5775 static const struct got_error *
5776 update_fileindex_after_commit(struct got_worktree *worktree,
5777     struct got_pathlist_head *commitable_paths,
5778     struct got_object_id *new_base_commit_id,
5779     struct got_fileindex *fileindex, int have_staged_files)
5780 {
5781 	const struct got_error *err = NULL;
5782 	struct got_pathlist_entry *pe;
5783 	char *relpath = NULL;
5784 
5785 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5786 		struct got_fileindex_entry *ie;
5787 		struct got_commitable *ct = pe->data;
5788 
5789 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
5790 
5791 		err = got_path_skip_common_ancestor(&relpath,
5792 		    worktree->root_path, ct->ondisk_path);
5793 		if (err)
5794 			goto done;
5795 
5796 		if (ie) {
5797 			if (ct->status == GOT_STATUS_DELETE ||
5798 			    ct->staged_status == GOT_STATUS_DELETE) {
5799 				got_fileindex_entry_remove(fileindex, ie);
5800 			} else if (ct->staged_status == GOT_STATUS_ADD ||
5801 			    ct->staged_status == GOT_STATUS_MODIFY) {
5802 				got_fileindex_entry_stage_set(ie,
5803 				    GOT_FILEIDX_STAGE_NONE);
5804 				got_fileindex_entry_staged_filetype_set(ie, 0);
5805 
5806 				err = got_fileindex_entry_update(ie,
5807 				    worktree->root_fd, relpath,
5808 				    ct->staged_blob_id->sha1,
5809 				    new_base_commit_id->sha1,
5810 				    !have_staged_files);
5811 			} else
5812 				err = got_fileindex_entry_update(ie,
5813 				    worktree->root_fd, relpath,
5814 				    ct->blob_id->sha1,
5815 				    new_base_commit_id->sha1,
5816 				    !have_staged_files);
5817 		} else {
5818 			err = got_fileindex_entry_alloc(&ie, pe->path);
5819 			if (err)
5820 				goto done;
5821 			err = got_fileindex_entry_update(ie,
5822 			    worktree->root_fd, relpath, ct->blob_id->sha1,
5823 			    new_base_commit_id->sha1, 1);
5824 			if (err) {
5825 				got_fileindex_entry_free(ie);
5826 				goto done;
5827 			}
5828 			err = got_fileindex_entry_add(fileindex, ie);
5829 			if (err) {
5830 				got_fileindex_entry_free(ie);
5831 				goto done;
5832 			}
5833 		}
5834 		free(relpath);
5835 		relpath = NULL;
5836 	}
5837 done:
5838 	free(relpath);
5839 	return err;
5840 }
5841 
5842 
5843 static const struct got_error *
5844 check_out_of_date(const char *in_repo_path, unsigned char status,
5845     unsigned char staged_status, struct got_object_id *base_blob_id,
5846     struct got_object_id *base_commit_id,
5847     struct got_object_id *head_commit_id, struct got_repository *repo,
5848     int ood_errcode)
5849 {
5850 	const struct got_error *err = NULL;
5851 	struct got_commit_object *commit = NULL;
5852 	struct got_object_id *id = NULL;
5853 
5854 	if (status != GOT_STATUS_ADD && staged_status != GOT_STATUS_ADD) {
5855 		/* Trivial case: base commit == head commit */
5856 		if (got_object_id_cmp(base_commit_id, head_commit_id) == 0)
5857 			return NULL;
5858 		/*
5859 		 * Ensure file content which local changes were based
5860 		 * on matches file content in the branch head.
5861 		 */
5862 		err = got_object_open_as_commit(&commit, repo, head_commit_id);
5863 		if (err)
5864 			goto done;
5865 		err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5866 		if (err) {
5867 			if (err->code == GOT_ERR_NO_TREE_ENTRY)
5868 				err = got_error(ood_errcode);
5869 			goto done;
5870 		} else if (got_object_id_cmp(id, base_blob_id) != 0)
5871 			err = got_error(ood_errcode);
5872 	} else {
5873 		/* Require that added files don't exist in the branch head. */
5874 		err = got_object_open_as_commit(&commit, repo, head_commit_id);
5875 		if (err)
5876 			goto done;
5877 		err = got_object_id_by_path(&id, repo, commit, in_repo_path);
5878 		if (err && err->code != GOT_ERR_NO_TREE_ENTRY)
5879 			goto done;
5880 		err = id ? got_error(ood_errcode) : NULL;
5881 	}
5882 done:
5883 	free(id);
5884 	if (commit)
5885 		got_object_commit_close(commit);
5886 	return err;
5887 }
5888 
5889 static const struct got_error *
5890 commit_worktree(struct got_object_id **new_commit_id,
5891     struct got_pathlist_head *commitable_paths,
5892     struct got_object_id *head_commit_id,
5893     struct got_object_id *parent_id2,
5894     struct got_worktree *worktree,
5895     const char *author, const char *committer, char *diff_path,
5896     got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
5897     got_worktree_status_cb status_cb, void *status_arg,
5898     struct got_repository *repo)
5899 {
5900 	const struct got_error *err = NULL, *unlockerr = NULL;
5901 	struct got_pathlist_entry *pe;
5902 	const char *head_ref_name = NULL;
5903 	struct got_commit_object *head_commit = NULL;
5904 	struct got_reference *head_ref2 = NULL;
5905 	struct got_object_id *head_commit_id2 = NULL;
5906 	struct got_tree_object *head_tree = NULL;
5907 	struct got_object_id *new_tree_id = NULL;
5908 	int nentries, nparents = 0;
5909 	struct got_object_id_queue parent_ids;
5910 	struct got_object_qid *pid = NULL;
5911 	char *logmsg = NULL;
5912 	time_t timestamp;
5913 
5914 	*new_commit_id = NULL;
5915 
5916 	STAILQ_INIT(&parent_ids);
5917 
5918 	err = got_object_open_as_commit(&head_commit, repo, head_commit_id);
5919 	if (err)
5920 		goto done;
5921 
5922 	err = got_object_open_as_tree(&head_tree, repo, head_commit->tree_id);
5923 	if (err)
5924 		goto done;
5925 
5926 	if (commit_msg_cb != NULL) {
5927 		err = commit_msg_cb(commitable_paths, diff_path,
5928 		    &logmsg, commit_arg);
5929 		if (err)
5930 			goto done;
5931 	}
5932 
5933 	if (logmsg == NULL || strlen(logmsg) == 0) {
5934 		err = got_error(GOT_ERR_COMMIT_MSG_EMPTY);
5935 		goto done;
5936 	}
5937 
5938 	/* Create blobs from added and modified files and record their IDs. */
5939 	TAILQ_FOREACH(pe, commitable_paths, entry) {
5940 		struct got_commitable *ct = pe->data;
5941 		char *ondisk_path;
5942 
5943 		/* Blobs for staged files already exist. */
5944 		if (ct->staged_status == GOT_STATUS_ADD ||
5945 		    ct->staged_status == GOT_STATUS_MODIFY)
5946 			continue;
5947 
5948 		if (ct->status != GOT_STATUS_ADD &&
5949 		    ct->status != GOT_STATUS_MODIFY &&
5950 		    ct->status != GOT_STATUS_MODE_CHANGE)
5951 			continue;
5952 
5953 		if (asprintf(&ondisk_path, "%s/%s",
5954 		    worktree->root_path, pe->path) == -1) {
5955 			err = got_error_from_errno("asprintf");
5956 			goto done;
5957 		}
5958 		err = got_object_blob_create(&ct->blob_id, ondisk_path, repo);
5959 		free(ondisk_path);
5960 		if (err)
5961 			goto done;
5962 	}
5963 
5964 	/* Recursively write new tree objects. */
5965 	err = write_tree(&new_tree_id, &nentries, head_tree, "/",
5966 	    commitable_paths, status_cb, status_arg, repo);
5967 	if (err)
5968 		goto done;
5969 
5970 	err = got_object_qid_alloc(&pid, worktree->base_commit_id);
5971 	if (err)
5972 		goto done;
5973 	STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5974 	nparents++;
5975 	if (parent_id2) {
5976 		err = got_object_qid_alloc(&pid, parent_id2);
5977 		if (err)
5978 			goto done;
5979 		STAILQ_INSERT_TAIL(&parent_ids, pid, entry);
5980 		nparents++;
5981 	}
5982 	timestamp = time(NULL);
5983 	err = got_object_commit_create(new_commit_id, new_tree_id, &parent_ids,
5984 	    nparents, author, timestamp, committer, timestamp, logmsg, repo);
5985 	if (logmsg != NULL)
5986 		free(logmsg);
5987 	if (err)
5988 		goto done;
5989 
5990 	/* Check if a concurrent commit to our branch has occurred. */
5991 	head_ref_name = got_worktree_get_head_ref_name(worktree);
5992 	if (head_ref_name == NULL) {
5993 		err = got_error_from_errno("got_worktree_get_head_ref_name");
5994 		goto done;
5995 	}
5996 	/* Lock the reference here to prevent concurrent modification. */
5997 	err = got_ref_open(&head_ref2, repo, head_ref_name, 1);
5998 	if (err)
5999 		goto done;
6000 	err = got_ref_resolve(&head_commit_id2, repo, head_ref2);
6001 	if (err)
6002 		goto done;
6003 	if (got_object_id_cmp(head_commit_id, head_commit_id2) != 0) {
6004 		err = got_error(GOT_ERR_COMMIT_HEAD_CHANGED);
6005 		goto done;
6006 	}
6007 	/* Update branch head in repository. */
6008 	err = got_ref_change_ref(head_ref2, *new_commit_id);
6009 	if (err)
6010 		goto done;
6011 	err = got_ref_write(head_ref2, repo);
6012 	if (err)
6013 		goto done;
6014 
6015 	err = got_worktree_set_base_commit_id(worktree, repo, *new_commit_id);
6016 	if (err)
6017 		goto done;
6018 
6019 	err = ref_base_commit(worktree, repo);
6020 	if (err)
6021 		goto done;
6022 done:
6023 	got_object_id_queue_free(&parent_ids);
6024 	if (head_tree)
6025 		got_object_tree_close(head_tree);
6026 	if (head_commit)
6027 		got_object_commit_close(head_commit);
6028 	free(head_commit_id2);
6029 	if (head_ref2) {
6030 		unlockerr = got_ref_unlock(head_ref2);
6031 		if (unlockerr && err == NULL)
6032 			err = unlockerr;
6033 		got_ref_close(head_ref2);
6034 	}
6035 	return err;
6036 }
6037 
6038 static const struct got_error *
6039 check_path_is_commitable(const char *path,
6040     struct got_pathlist_head *commitable_paths)
6041 {
6042 	struct got_pathlist_entry *cpe = NULL;
6043 	size_t path_len = strlen(path);
6044 
6045 	TAILQ_FOREACH(cpe, commitable_paths, entry) {
6046 		struct got_commitable *ct = cpe->data;
6047 		const char *ct_path = ct->path;
6048 
6049 		while (ct_path[0] == '/')
6050 			ct_path++;
6051 
6052 		if (strcmp(path, ct_path) == 0 ||
6053 		    got_path_is_child(ct_path, path, path_len))
6054 			break;
6055 	}
6056 
6057 	if (cpe == NULL)
6058 		return got_error_path(path, GOT_ERR_BAD_PATH);
6059 
6060 	return NULL;
6061 }
6062 
6063 static const struct got_error *
6064 check_staged_file(void *arg, struct got_fileindex_entry *ie)
6065 {
6066 	int *have_staged_files = arg;
6067 
6068 	if (got_fileindex_entry_stage_get(ie) != GOT_FILEIDX_STAGE_NONE) {
6069 		*have_staged_files = 1;
6070 		return got_error(GOT_ERR_CANCELLED);
6071 	}
6072 
6073 	return NULL;
6074 }
6075 
6076 static const struct got_error *
6077 check_non_staged_files(struct got_fileindex *fileindex,
6078     struct got_pathlist_head *paths)
6079 {
6080 	struct got_pathlist_entry *pe;
6081 	struct got_fileindex_entry *ie;
6082 
6083 	TAILQ_FOREACH(pe, paths, entry) {
6084 		if (pe->path[0] == '\0')
6085 			continue;
6086 		ie = got_fileindex_entry_get(fileindex, pe->path, pe->path_len);
6087 		if (ie == NULL)
6088 			return got_error_path(pe->path, GOT_ERR_BAD_PATH);
6089 		if (got_fileindex_entry_stage_get(ie) == GOT_FILEIDX_STAGE_NONE)
6090 			return got_error_path(pe->path,
6091 			    GOT_ERR_FILE_NOT_STAGED);
6092 	}
6093 
6094 	return NULL;
6095 }
6096 
6097 const struct got_error *
6098 got_worktree_commit(struct got_object_id **new_commit_id,
6099     struct got_worktree *worktree, struct got_pathlist_head *paths,
6100     const char *author, const char *committer, int allow_bad_symlinks,
6101     int show_diff, got_worktree_commit_msg_cb commit_msg_cb, void *commit_arg,
6102     got_worktree_status_cb status_cb, void *status_arg,
6103     struct got_repository *repo)
6104 {
6105 	const struct got_error *err = NULL, *unlockerr = NULL, *sync_err;
6106 	struct got_fileindex *fileindex = NULL;
6107 	char *fileindex_path = NULL;
6108 	struct got_pathlist_head commitable_paths;
6109 	struct collect_commitables_arg cc_arg;
6110 	struct got_pathlist_entry *pe;
6111 	struct got_reference *head_ref = NULL;
6112 	struct got_object_id *head_commit_id = NULL;
6113 	char *diff_path = NULL;
6114 	int have_staged_files = 0;
6115 
6116 	*new_commit_id = NULL;
6117 
6118 	memset(&cc_arg, 0, sizeof(cc_arg));
6119 	TAILQ_INIT(&commitable_paths);
6120 
6121 	err = lock_worktree(worktree, LOCK_EX);
6122 	if (err)
6123 		goto done;
6124 
6125 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6126 	if (err)
6127 		goto done;
6128 
6129 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
6130 	if (err)
6131 		goto done;
6132 
6133 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
6134 	if (err)
6135 		goto done;
6136 
6137 	err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
6138 	    &have_staged_files);
6139 	if (err && err->code != GOT_ERR_CANCELLED)
6140 		goto done;
6141 	if (have_staged_files) {
6142 		err = check_non_staged_files(fileindex, paths);
6143 		if (err)
6144 			goto done;
6145 	}
6146 
6147 	cc_arg.commitable_paths = &commitable_paths;
6148 	cc_arg.worktree = worktree;
6149 	cc_arg.fileindex = fileindex;
6150 	cc_arg.repo = repo;
6151 	cc_arg.have_staged_files = have_staged_files;
6152 	cc_arg.allow_bad_symlinks = allow_bad_symlinks;
6153 	cc_arg.diff_header_shown = 0;
6154 	if (show_diff) {
6155 		err = got_opentemp_named(&diff_path, &cc_arg.diff_outfile,
6156 		    GOT_TMPDIR_STR "/got", ".diff");
6157 		if (err)
6158 			goto done;
6159 		cc_arg.f1 = got_opentemp();
6160 		if (cc_arg.f1 == NULL) {
6161 			err = got_error_from_errno("got_opentemp");
6162 			goto done;
6163 		}
6164 		cc_arg.f2 = got_opentemp();
6165 		if (cc_arg.f2 == NULL) {
6166 			err = got_error_from_errno("got_opentemp");
6167 			goto done;
6168 		}
6169 	}
6170 
6171 	TAILQ_FOREACH(pe, paths, entry) {
6172 		err = worktree_status(worktree, pe->path, fileindex, repo,
6173 		    collect_commitables, &cc_arg, NULL, NULL, 0, 0);
6174 		if (err)
6175 			goto done;
6176 	}
6177 
6178 	if (show_diff) {
6179 		if (fflush(cc_arg.diff_outfile) == EOF) {
6180 			err = got_error_from_errno("fflush");
6181 			goto done;
6182 		}
6183 	}
6184 
6185 	if (TAILQ_EMPTY(&commitable_paths)) {
6186 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6187 		goto done;
6188 	}
6189 
6190 	TAILQ_FOREACH(pe, paths, entry) {
6191 		err = check_path_is_commitable(pe->path, &commitable_paths);
6192 		if (err)
6193 			goto done;
6194 	}
6195 
6196 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
6197 		struct got_commitable *ct = pe->data;
6198 		const char *ct_path = ct->in_repo_path;
6199 
6200 		while (ct_path[0] == '/')
6201 			ct_path++;
6202 		err = check_out_of_date(ct_path, ct->status,
6203 		    ct->staged_status, ct->base_blob_id, ct->base_commit_id,
6204 		    head_commit_id, repo, GOT_ERR_COMMIT_OUT_OF_DATE);
6205 		if (err)
6206 			goto done;
6207 
6208 	}
6209 
6210 	err = commit_worktree(new_commit_id, &commitable_paths,
6211 	    head_commit_id, NULL, worktree, author, committer, diff_path,
6212 	    commit_msg_cb, commit_arg, status_cb, status_arg, repo);
6213 	if (err)
6214 		goto done;
6215 
6216 	err = update_fileindex_after_commit(worktree, &commitable_paths,
6217 	    *new_commit_id, fileindex, have_staged_files);
6218 	sync_err = sync_fileindex(fileindex, fileindex_path);
6219 	if (sync_err && err == NULL)
6220 		err = sync_err;
6221 done:
6222 	if (fileindex)
6223 		got_fileindex_free(fileindex);
6224 	free(fileindex_path);
6225 	unlockerr = lock_worktree(worktree, LOCK_SH);
6226 	if (unlockerr && err == NULL)
6227 		err = unlockerr;
6228 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
6229 		struct got_commitable *ct = pe->data;
6230 		free_commitable(ct);
6231 	}
6232 	got_pathlist_free(&commitable_paths);
6233 	if (diff_path && unlink(diff_path) == -1 && err == NULL)
6234 		err = got_error_from_errno2("unlink", diff_path);
6235 	free(diff_path);
6236 	if (cc_arg.diff_outfile && fclose(cc_arg.diff_outfile) == EOF &&
6237 	    err == NULL)
6238 		err = got_error_from_errno("fclose");
6239 	return err;
6240 }
6241 
6242 const char *
6243 got_commitable_get_path(struct got_commitable *ct)
6244 {
6245 	return ct->path;
6246 }
6247 
6248 unsigned int
6249 got_commitable_get_status(struct got_commitable *ct)
6250 {
6251 	return ct->status;
6252 }
6253 
6254 struct check_rebase_ok_arg {
6255 	struct got_worktree *worktree;
6256 	struct got_repository *repo;
6257 };
6258 
6259 static const struct got_error *
6260 check_rebase_ok(void *arg, struct got_fileindex_entry *ie)
6261 {
6262 	const struct got_error *err = NULL;
6263 	struct check_rebase_ok_arg *a = arg;
6264 	unsigned char status;
6265 	struct stat sb;
6266 	char *ondisk_path;
6267 
6268 	/* Reject rebase of a work tree with mixed base commits. */
6269 	if (memcmp(ie->commit_sha1, a->worktree->base_commit_id->sha1,
6270 	    SHA1_DIGEST_LENGTH))
6271 		return got_error(GOT_ERR_MIXED_COMMITS);
6272 
6273 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, ie->path)
6274 	    == -1)
6275 		return got_error_from_errno("asprintf");
6276 
6277 	/* Reject rebase of a work tree with modified or staged files. */
6278 	err = get_file_status(&status, &sb, ie, ondisk_path, -1, NULL, a->repo);
6279 	free(ondisk_path);
6280 	if (err)
6281 		return err;
6282 
6283 	if (status != GOT_STATUS_NO_CHANGE)
6284 		return got_error(GOT_ERR_MODIFIED);
6285 	if (get_staged_status(ie) != GOT_STATUS_NO_CHANGE)
6286 		return got_error_path(ie->path, GOT_ERR_FILE_STAGED);
6287 
6288 	return NULL;
6289 }
6290 
6291 const struct got_error *
6292 got_worktree_rebase_prepare(struct got_reference **new_base_branch_ref,
6293     struct got_reference **tmp_branch, struct got_fileindex **fileindex,
6294     struct got_worktree *worktree, struct got_reference *branch,
6295     struct got_repository *repo)
6296 {
6297 	const struct got_error *err = NULL;
6298 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6299 	char *branch_ref_name = NULL;
6300 	char *fileindex_path = NULL;
6301 	struct check_rebase_ok_arg ok_arg;
6302 	struct got_reference *wt_branch = NULL, *branch_ref = NULL;
6303 	struct got_object_id *wt_branch_tip = NULL;
6304 
6305 	*new_base_branch_ref = NULL;
6306 	*tmp_branch = NULL;
6307 	*fileindex = NULL;
6308 
6309 	err = lock_worktree(worktree, LOCK_EX);
6310 	if (err)
6311 		return err;
6312 
6313 	err = open_fileindex(fileindex, &fileindex_path, worktree);
6314 	if (err)
6315 		goto done;
6316 
6317 	ok_arg.worktree = worktree;
6318 	ok_arg.repo = repo;
6319 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
6320 	    &ok_arg);
6321 	if (err)
6322 		goto done;
6323 
6324 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6325 	if (err)
6326 		goto done;
6327 
6328 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6329 	if (err)
6330 		goto done;
6331 
6332 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6333 	if (err)
6334 		goto done;
6335 
6336 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
6337 	    0);
6338 	if (err)
6339 		goto done;
6340 
6341 	err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
6342 	if (err)
6343 		goto done;
6344 	if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
6345 		err = got_error(GOT_ERR_REBASE_OUT_OF_DATE);
6346 		goto done;
6347 	}
6348 
6349 	err = got_ref_alloc_symref(new_base_branch_ref,
6350 	    new_base_branch_ref_name, wt_branch);
6351 	if (err)
6352 		goto done;
6353 	err = got_ref_write(*new_base_branch_ref, repo);
6354 	if (err)
6355 		goto done;
6356 
6357 	/* TODO Lock original branch's ref while rebasing? */
6358 
6359 	err = got_ref_alloc_symref(&branch_ref, branch_ref_name, branch);
6360 	if (err)
6361 		goto done;
6362 
6363 	err = got_ref_write(branch_ref, repo);
6364 	if (err)
6365 		goto done;
6366 
6367 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
6368 	    worktree->base_commit_id);
6369 	if (err)
6370 		goto done;
6371 	err = got_ref_write(*tmp_branch, repo);
6372 	if (err)
6373 		goto done;
6374 
6375 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
6376 	if (err)
6377 		goto done;
6378 done:
6379 	free(fileindex_path);
6380 	free(tmp_branch_name);
6381 	free(new_base_branch_ref_name);
6382 	free(branch_ref_name);
6383 	if (branch_ref)
6384 		got_ref_close(branch_ref);
6385 	if (wt_branch)
6386 		got_ref_close(wt_branch);
6387 	free(wt_branch_tip);
6388 	if (err) {
6389 		if (*new_base_branch_ref) {
6390 			got_ref_close(*new_base_branch_ref);
6391 			*new_base_branch_ref = NULL;
6392 		}
6393 		if (*tmp_branch) {
6394 			got_ref_close(*tmp_branch);
6395 			*tmp_branch = NULL;
6396 		}
6397 		if (*fileindex) {
6398 			got_fileindex_free(*fileindex);
6399 			*fileindex = NULL;
6400 		}
6401 		lock_worktree(worktree, LOCK_SH);
6402 	}
6403 	return err;
6404 }
6405 
6406 const struct got_error *
6407 got_worktree_rebase_continue(struct got_object_id **commit_id,
6408     struct got_reference **new_base_branch, struct got_reference **tmp_branch,
6409     struct got_reference **branch, struct got_fileindex **fileindex,
6410     struct got_worktree *worktree, struct got_repository *repo)
6411 {
6412 	const struct got_error *err;
6413 	char *commit_ref_name = NULL, *new_base_branch_ref_name = NULL;
6414 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
6415 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
6416 	char *fileindex_path = NULL;
6417 	int have_staged_files = 0;
6418 
6419 	*commit_id = NULL;
6420 	*new_base_branch = NULL;
6421 	*tmp_branch = NULL;
6422 	*branch = NULL;
6423 	*fileindex = NULL;
6424 
6425 	err = lock_worktree(worktree, LOCK_EX);
6426 	if (err)
6427 		return err;
6428 
6429 	err = open_fileindex(fileindex, &fileindex_path, worktree);
6430 	if (err)
6431 		goto done;
6432 
6433 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
6434 	    &have_staged_files);
6435 	if (err && err->code != GOT_ERR_CANCELLED)
6436 		goto done;
6437 	if (have_staged_files) {
6438 		err = got_error(GOT_ERR_STAGED_PATHS);
6439 		goto done;
6440 	}
6441 
6442 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6443 	if (err)
6444 		goto done;
6445 
6446 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6447 	if (err)
6448 		goto done;
6449 
6450 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6451 	if (err)
6452 		goto done;
6453 
6454 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6455 	if (err)
6456 		goto done;
6457 
6458 	err = got_ref_open(&branch_ref, repo, branch_ref_name, 0);
6459 	if (err)
6460 		goto done;
6461 
6462 	err = got_ref_open(branch, repo,
6463 	    got_ref_get_symref_target(branch_ref), 0);
6464 	if (err)
6465 		goto done;
6466 
6467 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6468 	if (err)
6469 		goto done;
6470 
6471 	err = got_ref_resolve(commit_id, repo, commit_ref);
6472 	if (err)
6473 		goto done;
6474 
6475 	err = got_ref_open(new_base_branch, repo,
6476 	    new_base_branch_ref_name, 0);
6477 	if (err)
6478 		goto done;
6479 
6480 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
6481 	if (err)
6482 		goto done;
6483 done:
6484 	free(commit_ref_name);
6485 	free(branch_ref_name);
6486 	free(fileindex_path);
6487 	if (commit_ref)
6488 		got_ref_close(commit_ref);
6489 	if (branch_ref)
6490 		got_ref_close(branch_ref);
6491 	if (err) {
6492 		free(*commit_id);
6493 		*commit_id = NULL;
6494 		if (*tmp_branch) {
6495 			got_ref_close(*tmp_branch);
6496 			*tmp_branch = NULL;
6497 		}
6498 		if (*new_base_branch) {
6499 			got_ref_close(*new_base_branch);
6500 			*new_base_branch = NULL;
6501 		}
6502 		if (*branch) {
6503 			got_ref_close(*branch);
6504 			*branch = NULL;
6505 		}
6506 		if (*fileindex) {
6507 			got_fileindex_free(*fileindex);
6508 			*fileindex = NULL;
6509 		}
6510 		lock_worktree(worktree, LOCK_SH);
6511 	}
6512 	return err;
6513 }
6514 
6515 const struct got_error *
6516 got_worktree_rebase_in_progress(int *in_progress, struct got_worktree *worktree)
6517 {
6518 	const struct got_error *err;
6519 	char *tmp_branch_name = NULL;
6520 
6521 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6522 	if (err)
6523 		return err;
6524 
6525 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
6526 	free(tmp_branch_name);
6527 	return NULL;
6528 }
6529 
6530 static const struct got_error *
6531 collect_rebase_commit_msg(struct got_pathlist_head *commitable_paths,
6532     const char *diff_path, char **logmsg, void *arg)
6533 {
6534 	*logmsg = arg;
6535 	return NULL;
6536 }
6537 
6538 static const struct got_error *
6539 rebase_status(void *arg, unsigned char status, unsigned char staged_status,
6540     const char *path, struct got_object_id *blob_id,
6541     struct got_object_id *staged_blob_id, struct got_object_id *commit_id,
6542     int dirfd, const char *de_name)
6543 {
6544 	return NULL;
6545 }
6546 
6547 struct collect_merged_paths_arg {
6548 	got_worktree_checkout_cb progress_cb;
6549 	void *progress_arg;
6550 	struct got_pathlist_head *merged_paths;
6551 };
6552 
6553 static const struct got_error *
6554 collect_merged_paths(void *arg, unsigned char status, const char *path)
6555 {
6556 	const struct got_error *err;
6557 	struct collect_merged_paths_arg *a = arg;
6558 	char *p;
6559 	struct got_pathlist_entry *new;
6560 
6561 	err = (*a->progress_cb)(a->progress_arg, status, path);
6562 	if (err)
6563 		return err;
6564 
6565 	if (status != GOT_STATUS_MERGE &&
6566 	    status != GOT_STATUS_ADD &&
6567 	    status != GOT_STATUS_DELETE &&
6568 	    status != GOT_STATUS_CONFLICT)
6569 		return NULL;
6570 
6571 	p = strdup(path);
6572 	if (p == NULL)
6573 		return got_error_from_errno("strdup");
6574 
6575 	err = got_pathlist_insert(&new, a->merged_paths, p, NULL);
6576 	if (err || new == NULL)
6577 		free(p);
6578 	return err;
6579 }
6580 
6581 void
6582 got_worktree_rebase_pathlist_free(struct got_pathlist_head *merged_paths)
6583 {
6584 	struct got_pathlist_entry *pe;
6585 
6586 	TAILQ_FOREACH(pe, merged_paths, entry)
6587 		free((char *)pe->path);
6588 
6589 	got_pathlist_free(merged_paths);
6590 }
6591 
6592 static const struct got_error *
6593 store_commit_id(const char *commit_ref_name, struct got_object_id *commit_id,
6594     int is_rebase, struct got_repository *repo)
6595 {
6596 	const struct got_error *err;
6597 	struct got_reference *commit_ref = NULL;
6598 
6599 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6600 	if (err) {
6601 		if (err->code != GOT_ERR_NOT_REF)
6602 			goto done;
6603 		err = got_ref_alloc(&commit_ref, commit_ref_name, commit_id);
6604 		if (err)
6605 			goto done;
6606 		err = got_ref_write(commit_ref, repo);
6607 		if (err)
6608 			goto done;
6609 	} else if (is_rebase) {
6610 		struct got_object_id *stored_id;
6611 		int cmp;
6612 
6613 		err = got_ref_resolve(&stored_id, repo, commit_ref);
6614 		if (err)
6615 			goto done;
6616 		cmp = got_object_id_cmp(commit_id, stored_id);
6617 		free(stored_id);
6618 		if (cmp != 0) {
6619 			err = got_error(GOT_ERR_REBASE_COMMITID);
6620 			goto done;
6621 		}
6622 	}
6623 done:
6624 	if (commit_ref)
6625 		got_ref_close(commit_ref);
6626 	return err;
6627 }
6628 
6629 static const struct got_error *
6630 rebase_merge_files(struct got_pathlist_head *merged_paths,
6631     const char *commit_ref_name, struct got_worktree *worktree,
6632     struct got_fileindex *fileindex, struct got_object_id *parent_commit_id,
6633     struct got_object_id *commit_id, struct got_repository *repo,
6634     got_worktree_checkout_cb progress_cb, void *progress_arg,
6635     got_cancel_cb cancel_cb, void *cancel_arg)
6636 {
6637 	const struct got_error *err;
6638 	struct got_reference *commit_ref = NULL;
6639 	struct collect_merged_paths_arg cmp_arg;
6640 	char *fileindex_path;
6641 
6642 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
6643 
6644 	err = get_fileindex_path(&fileindex_path, worktree);
6645 	if (err)
6646 		return err;
6647 
6648 	cmp_arg.progress_cb = progress_cb;
6649 	cmp_arg.progress_arg = progress_arg;
6650 	cmp_arg.merged_paths = merged_paths;
6651 	err = merge_files(worktree, fileindex, fileindex_path,
6652 	    parent_commit_id, commit_id, repo, collect_merged_paths,
6653 	    &cmp_arg, cancel_cb, cancel_arg);
6654 	if (commit_ref)
6655 		got_ref_close(commit_ref);
6656 	return err;
6657 }
6658 
6659 const struct got_error *
6660 got_worktree_rebase_merge_files(struct got_pathlist_head *merged_paths,
6661     struct got_worktree *worktree, struct got_fileindex *fileindex,
6662     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6663     struct got_repository *repo,
6664     got_worktree_checkout_cb progress_cb, void *progress_arg,
6665     got_cancel_cb cancel_cb, void *cancel_arg)
6666 {
6667 	const struct got_error *err;
6668 	char *commit_ref_name;
6669 
6670 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6671 	if (err)
6672 		return err;
6673 
6674 	err = store_commit_id(commit_ref_name, commit_id, 1, repo);
6675 	if (err)
6676 		goto done;
6677 
6678 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6679 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
6680 	    progress_arg, cancel_cb, cancel_arg);
6681 done:
6682 	free(commit_ref_name);
6683 	return err;
6684 }
6685 
6686 const struct got_error *
6687 got_worktree_histedit_merge_files(struct got_pathlist_head *merged_paths,
6688     struct got_worktree *worktree, struct got_fileindex *fileindex,
6689     struct got_object_id *parent_commit_id, struct got_object_id *commit_id,
6690     struct got_repository *repo,
6691     got_worktree_checkout_cb progress_cb, void *progress_arg,
6692     got_cancel_cb cancel_cb, void *cancel_arg)
6693 {
6694 	const struct got_error *err;
6695 	char *commit_ref_name;
6696 
6697 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6698 	if (err)
6699 		return err;
6700 
6701 	err = store_commit_id(commit_ref_name, commit_id, 0, repo);
6702 	if (err)
6703 		goto done;
6704 
6705 	err = rebase_merge_files(merged_paths, commit_ref_name, worktree,
6706 	    fileindex, parent_commit_id, commit_id, repo, progress_cb,
6707 	    progress_arg, cancel_cb, cancel_arg);
6708 done:
6709 	free(commit_ref_name);
6710 	return err;
6711 }
6712 
6713 static const struct got_error *
6714 rebase_commit(struct got_object_id **new_commit_id,
6715     struct got_pathlist_head *merged_paths, struct got_reference *commit_ref,
6716     struct got_worktree *worktree, struct got_fileindex *fileindex,
6717     struct got_reference *tmp_branch, const char *committer,
6718     struct got_commit_object *orig_commit, const char *new_logmsg,
6719     struct got_repository *repo)
6720 {
6721 	const struct got_error *err, *sync_err;
6722 	struct got_pathlist_head commitable_paths;
6723 	struct collect_commitables_arg cc_arg;
6724 	char *fileindex_path = NULL;
6725 	struct got_reference *head_ref = NULL;
6726 	struct got_object_id *head_commit_id = NULL;
6727 	char *logmsg = NULL;
6728 
6729 	memset(&cc_arg, 0, sizeof(cc_arg));
6730 	TAILQ_INIT(&commitable_paths);
6731 	*new_commit_id = NULL;
6732 
6733 	/* Work tree is locked/unlocked during rebase preparation/teardown. */
6734 
6735 	err = get_fileindex_path(&fileindex_path, worktree);
6736 	if (err)
6737 		return err;
6738 
6739 	cc_arg.commitable_paths = &commitable_paths;
6740 	cc_arg.worktree = worktree;
6741 	cc_arg.repo = repo;
6742 	cc_arg.have_staged_files = 0;
6743 	/*
6744 	 * If possible get the status of individual files directly to
6745 	 * avoid crawling the entire work tree once per rebased commit.
6746 	 *
6747 	 * Ideally, merged_paths would contain a list of commitables
6748 	 * we could use so we could skip worktree_status() entirely.
6749 	 * However, we would then need carefully keep track of cumulative
6750 	 * effects of operations such as file additions and deletions
6751 	 * in 'got histedit -f' (folding multiple commits into one),
6752 	 * and this extra complexity is not really worth it.
6753 	 */
6754 	if (merged_paths) {
6755 		struct got_pathlist_entry *pe;
6756 		TAILQ_FOREACH(pe, merged_paths, entry) {
6757 			err = worktree_status(worktree, pe->path, fileindex,
6758 			    repo, collect_commitables, &cc_arg, NULL, NULL, 1,
6759 			    0);
6760 			if (err)
6761 				goto done;
6762 		}
6763 	} else {
6764 		err = worktree_status(worktree, "", fileindex, repo,
6765 		    collect_commitables, &cc_arg, NULL, NULL, 1, 0);
6766 		if (err)
6767 			goto done;
6768 	}
6769 
6770 	if (TAILQ_EMPTY(&commitable_paths)) {
6771 		/* No-op change; commit will be elided. */
6772 		err = got_ref_delete(commit_ref, repo);
6773 		if (err)
6774 			goto done;
6775 		err = got_error(GOT_ERR_COMMIT_NO_CHANGES);
6776 		goto done;
6777 	}
6778 
6779 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
6780 	if (err)
6781 		goto done;
6782 
6783 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
6784 	if (err)
6785 		goto done;
6786 
6787 	if (new_logmsg) {
6788 		logmsg = strdup(new_logmsg);
6789 		if (logmsg == NULL) {
6790 			err = got_error_from_errno("strdup");
6791 			goto done;
6792 		}
6793 	} else {
6794 		err = got_object_commit_get_logmsg(&logmsg, orig_commit);
6795 		if (err)
6796 			goto done;
6797 	}
6798 
6799 	/* NB: commit_worktree will call free(logmsg) */
6800 	err = commit_worktree(new_commit_id, &commitable_paths, head_commit_id,
6801 	    NULL, worktree, got_object_commit_get_author(orig_commit),
6802 	    committer ? committer :
6803 	    got_object_commit_get_committer(orig_commit), NULL,
6804 	    collect_rebase_commit_msg, logmsg, rebase_status, NULL, repo);
6805 	if (err)
6806 		goto done;
6807 
6808 	err = got_ref_change_ref(tmp_branch, *new_commit_id);
6809 	if (err)
6810 		goto done;
6811 
6812 	err = got_ref_delete(commit_ref, repo);
6813 	if (err)
6814 		goto done;
6815 
6816 	err = update_fileindex_after_commit(worktree, &commitable_paths,
6817 	    *new_commit_id, fileindex, 0);
6818 	sync_err = sync_fileindex(fileindex, fileindex_path);
6819 	if (sync_err && err == NULL)
6820 		err = sync_err;
6821 done:
6822 	free(fileindex_path);
6823 	free(head_commit_id);
6824 	if (head_ref)
6825 		got_ref_close(head_ref);
6826 	if (err) {
6827 		free(*new_commit_id);
6828 		*new_commit_id = NULL;
6829 	}
6830 	return err;
6831 }
6832 
6833 const struct got_error *
6834 got_worktree_rebase_commit(struct got_object_id **new_commit_id,
6835     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6836     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6837     const char *committer, struct got_commit_object *orig_commit,
6838     struct got_object_id *orig_commit_id, struct got_repository *repo)
6839 {
6840 	const struct got_error *err;
6841 	char *commit_ref_name;
6842 	struct got_reference *commit_ref = NULL;
6843 	struct got_object_id *commit_id = NULL;
6844 
6845 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6846 	if (err)
6847 		return err;
6848 
6849 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6850 	if (err)
6851 		goto done;
6852 	err = got_ref_resolve(&commit_id, repo, commit_ref);
6853 	if (err)
6854 		goto done;
6855 	if (got_object_id_cmp(commit_id, orig_commit_id) != 0) {
6856 		err = got_error(GOT_ERR_REBASE_COMMITID);
6857 		goto done;
6858 	}
6859 
6860 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6861 	    worktree, fileindex, tmp_branch, committer, orig_commit,
6862 	    NULL, repo);
6863 done:
6864 	if (commit_ref)
6865 		got_ref_close(commit_ref);
6866 	free(commit_ref_name);
6867 	free(commit_id);
6868 	return err;
6869 }
6870 
6871 const struct got_error *
6872 got_worktree_histedit_commit(struct got_object_id **new_commit_id,
6873     struct got_pathlist_head *merged_paths, struct got_worktree *worktree,
6874     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
6875     const char *committer, struct got_commit_object *orig_commit,
6876     struct got_object_id *orig_commit_id, const char *new_logmsg,
6877     struct got_repository *repo)
6878 {
6879 	const struct got_error *err;
6880 	char *commit_ref_name;
6881 	struct got_reference *commit_ref = NULL;
6882 
6883 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
6884 	if (err)
6885 		return err;
6886 
6887 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
6888 	if (err)
6889 		goto done;
6890 
6891 	err = rebase_commit(new_commit_id, merged_paths, commit_ref,
6892 	    worktree, fileindex, tmp_branch, committer, orig_commit,
6893 	    new_logmsg, repo);
6894 done:
6895 	if (commit_ref)
6896 		got_ref_close(commit_ref);
6897 	free(commit_ref_name);
6898 	return err;
6899 }
6900 
6901 const struct got_error *
6902 got_worktree_rebase_postpone(struct got_worktree *worktree,
6903     struct got_fileindex *fileindex)
6904 {
6905 	if (fileindex)
6906 		got_fileindex_free(fileindex);
6907 	return lock_worktree(worktree, LOCK_SH);
6908 }
6909 
6910 static const struct got_error *
6911 delete_ref(const char *name, struct got_repository *repo)
6912 {
6913 	const struct got_error *err;
6914 	struct got_reference *ref;
6915 
6916 	err = got_ref_open(&ref, repo, name, 0);
6917 	if (err) {
6918 		if (err->code == GOT_ERR_NOT_REF)
6919 			return NULL;
6920 		return err;
6921 	}
6922 
6923 	err = got_ref_delete(ref, repo);
6924 	got_ref_close(ref);
6925 	return err;
6926 }
6927 
6928 static const struct got_error *
6929 delete_rebase_refs(struct got_worktree *worktree, struct got_repository *repo)
6930 {
6931 	const struct got_error *err;
6932 	char *tmp_branch_name = NULL, *new_base_branch_ref_name = NULL;
6933 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
6934 
6935 	err = get_rebase_tmp_ref_name(&tmp_branch_name, worktree);
6936 	if (err)
6937 		goto done;
6938 	err = delete_ref(tmp_branch_name, repo);
6939 	if (err)
6940 		goto done;
6941 
6942 	err = get_newbase_symref_name(&new_base_branch_ref_name, worktree);
6943 	if (err)
6944 		goto done;
6945 	err = delete_ref(new_base_branch_ref_name, repo);
6946 	if (err)
6947 		goto done;
6948 
6949 	err = get_rebase_branch_symref_name(&branch_ref_name, worktree);
6950 	if (err)
6951 		goto done;
6952 	err = delete_ref(branch_ref_name, repo);
6953 	if (err)
6954 		goto done;
6955 
6956 	err = get_rebase_commit_ref_name(&commit_ref_name, worktree);
6957 	if (err)
6958 		goto done;
6959 	err = delete_ref(commit_ref_name, repo);
6960 	if (err)
6961 		goto done;
6962 
6963 done:
6964 	free(tmp_branch_name);
6965 	free(new_base_branch_ref_name);
6966 	free(branch_ref_name);
6967 	free(commit_ref_name);
6968 	return err;
6969 }
6970 
6971 static const struct got_error *
6972 create_backup_ref(const char *backup_ref_prefix, struct got_reference *branch,
6973     struct got_object_id *new_commit_id, struct got_repository *repo)
6974 {
6975 	const struct got_error *err;
6976 	struct got_reference *ref = NULL;
6977 	struct got_object_id *old_commit_id = NULL;
6978 	const char *branch_name = NULL;
6979 	char *new_id_str = NULL;
6980 	char *refname = NULL;
6981 
6982 	branch_name = got_ref_get_name(branch);
6983 	if (strncmp(branch_name, "refs/heads/", 11) != 0)
6984 		return got_error(GOT_ERR_BAD_REF_NAME); /* should not happen */
6985 	branch_name += 11;
6986 
6987 	err = got_object_id_str(&new_id_str, new_commit_id);
6988 	if (err)
6989 		return err;
6990 
6991 	if (asprintf(&refname, "%s/%s/%s", backup_ref_prefix, branch_name,
6992 	    new_id_str) == -1) {
6993 		err = got_error_from_errno("asprintf");
6994 		goto done;
6995 	}
6996 
6997 	err = got_ref_resolve(&old_commit_id, repo, branch);
6998 	if (err)
6999 		goto done;
7000 
7001 	err = got_ref_alloc(&ref, refname, old_commit_id);
7002 	if (err)
7003 		goto done;
7004 
7005 	err = got_ref_write(ref, repo);
7006 done:
7007 	free(new_id_str);
7008 	free(refname);
7009 	free(old_commit_id);
7010 	if (ref)
7011 		got_ref_close(ref);
7012 	return err;
7013 }
7014 
7015 const struct got_error *
7016 got_worktree_rebase_complete(struct got_worktree *worktree,
7017     struct got_fileindex *fileindex, struct got_reference *new_base_branch,
7018     struct got_reference *tmp_branch, struct got_reference *rebased_branch,
7019     struct got_repository *repo, int create_backup)
7020 {
7021 	const struct got_error *err, *unlockerr, *sync_err;
7022 	struct got_object_id *new_head_commit_id = NULL;
7023 	char *fileindex_path = NULL;
7024 
7025 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7026 	if (err)
7027 		return err;
7028 
7029 	if (create_backup) {
7030 		err = create_backup_ref(GOT_WORKTREE_REBASE_BACKUP_REF_PREFIX,
7031 		    rebased_branch, new_head_commit_id, repo);
7032 		if (err)
7033 			goto done;
7034 	}
7035 
7036 	err = got_ref_change_ref(rebased_branch, new_head_commit_id);
7037 	if (err)
7038 		goto done;
7039 
7040 	err = got_ref_write(rebased_branch, repo);
7041 	if (err)
7042 		goto done;
7043 
7044 	err = got_worktree_set_head_ref(worktree, rebased_branch);
7045 	if (err)
7046 		goto done;
7047 
7048 	err = delete_rebase_refs(worktree, repo);
7049 	if (err)
7050 		goto done;
7051 
7052 	err = get_fileindex_path(&fileindex_path, worktree);
7053 	if (err)
7054 		goto done;
7055 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7056 	sync_err = sync_fileindex(fileindex, fileindex_path);
7057 	if (sync_err && err == NULL)
7058 		err = sync_err;
7059 done:
7060 	got_fileindex_free(fileindex);
7061 	free(fileindex_path);
7062 	free(new_head_commit_id);
7063 	unlockerr = lock_worktree(worktree, LOCK_SH);
7064 	if (unlockerr && err == NULL)
7065 		err = unlockerr;
7066 	return err;
7067 }
7068 
7069 const struct got_error *
7070 got_worktree_rebase_abort(struct got_worktree *worktree,
7071     struct got_fileindex *fileindex, struct got_repository *repo,
7072     struct got_reference *new_base_branch,
7073     got_worktree_checkout_cb progress_cb, void *progress_arg)
7074 {
7075 	const struct got_error *err, *unlockerr, *sync_err;
7076 	struct got_reference *resolved = NULL;
7077 	struct got_object_id *commit_id = NULL;
7078 	struct got_commit_object *commit = NULL;
7079 	char *fileindex_path = NULL;
7080 	struct revert_file_args rfa;
7081 	struct got_object_id *tree_id = NULL;
7082 
7083 	err = lock_worktree(worktree, LOCK_EX);
7084 	if (err)
7085 		return err;
7086 
7087 	err = got_object_open_as_commit(&commit, repo,
7088 	    worktree->base_commit_id);
7089 	if (err)
7090 		goto done;
7091 
7092 	err = got_ref_open(&resolved, repo,
7093 	    got_ref_get_symref_target(new_base_branch), 0);
7094 	if (err)
7095 		goto done;
7096 
7097 	err = got_worktree_set_head_ref(worktree, resolved);
7098 	if (err)
7099 		goto done;
7100 
7101 	/*
7102 	 * XXX commits to the base branch could have happened while
7103 	 * we were busy rebasing; should we store the original commit ID
7104 	 * when rebase begins and read it back here?
7105 	 */
7106 	err = got_ref_resolve(&commit_id, repo, resolved);
7107 	if (err)
7108 		goto done;
7109 
7110 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7111 	if (err)
7112 		goto done;
7113 
7114 	err = got_object_id_by_path(&tree_id, repo, commit,
7115 	    worktree->path_prefix);
7116 	if (err)
7117 		goto done;
7118 
7119 	err = delete_rebase_refs(worktree, repo);
7120 	if (err)
7121 		goto done;
7122 
7123 	err = get_fileindex_path(&fileindex_path, worktree);
7124 	if (err)
7125 		goto done;
7126 
7127 	rfa.worktree = worktree;
7128 	rfa.fileindex = fileindex;
7129 	rfa.progress_cb = progress_cb;
7130 	rfa.progress_arg = progress_arg;
7131 	rfa.patch_cb = NULL;
7132 	rfa.patch_arg = NULL;
7133 	rfa.repo = repo;
7134 	rfa.unlink_added_files = 0;
7135 	err = worktree_status(worktree, "", fileindex, repo,
7136 	    revert_file, &rfa, NULL, NULL, 1, 0);
7137 	if (err)
7138 		goto sync;
7139 
7140 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7141 	    repo, progress_cb, progress_arg, NULL, NULL);
7142 sync:
7143 	sync_err = sync_fileindex(fileindex, fileindex_path);
7144 	if (sync_err && err == NULL)
7145 		err = sync_err;
7146 done:
7147 	got_ref_close(resolved);
7148 	free(tree_id);
7149 	free(commit_id);
7150 	if (commit)
7151 		got_object_commit_close(commit);
7152 	if (fileindex)
7153 		got_fileindex_free(fileindex);
7154 	free(fileindex_path);
7155 
7156 	unlockerr = lock_worktree(worktree, LOCK_SH);
7157 	if (unlockerr && err == NULL)
7158 		err = unlockerr;
7159 	return err;
7160 }
7161 
7162 const struct got_error *
7163 got_worktree_histedit_prepare(struct got_reference **tmp_branch,
7164     struct got_reference **branch_ref, struct got_object_id **base_commit_id,
7165     struct got_fileindex **fileindex, struct got_worktree *worktree,
7166     struct got_repository *repo)
7167 {
7168 	const struct got_error *err = NULL;
7169 	char *tmp_branch_name = NULL;
7170 	char *branch_ref_name = NULL;
7171 	char *base_commit_ref_name = NULL;
7172 	char *fileindex_path = NULL;
7173 	struct check_rebase_ok_arg ok_arg;
7174 	struct got_reference *wt_branch = NULL;
7175 	struct got_reference *base_commit_ref = NULL;
7176 
7177 	*tmp_branch = NULL;
7178 	*branch_ref = NULL;
7179 	*base_commit_id = NULL;
7180 	*fileindex = NULL;
7181 
7182 	err = lock_worktree(worktree, LOCK_EX);
7183 	if (err)
7184 		return err;
7185 
7186 	err = open_fileindex(fileindex, &fileindex_path, worktree);
7187 	if (err)
7188 		goto done;
7189 
7190 	ok_arg.worktree = worktree;
7191 	ok_arg.repo = repo;
7192 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7193 	    &ok_arg);
7194 	if (err)
7195 		goto done;
7196 
7197 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7198 	if (err)
7199 		goto done;
7200 
7201 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7202 	if (err)
7203 		goto done;
7204 
7205 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7206 	    worktree);
7207 	if (err)
7208 		goto done;
7209 
7210 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
7211 	    0);
7212 	if (err)
7213 		goto done;
7214 
7215 	err = got_ref_alloc_symref(branch_ref, branch_ref_name, wt_branch);
7216 	if (err)
7217 		goto done;
7218 
7219 	err = got_ref_write(*branch_ref, repo);
7220 	if (err)
7221 		goto done;
7222 
7223 	err = got_ref_alloc(&base_commit_ref, base_commit_ref_name,
7224 	    worktree->base_commit_id);
7225 	if (err)
7226 		goto done;
7227 	err = got_ref_write(base_commit_ref, repo);
7228 	if (err)
7229 		goto done;
7230 	*base_commit_id = got_object_id_dup(worktree->base_commit_id);
7231 	if (*base_commit_id == NULL) {
7232 		err = got_error_from_errno("got_object_id_dup");
7233 		goto done;
7234 	}
7235 
7236 	err = got_ref_alloc(tmp_branch, tmp_branch_name,
7237 	    worktree->base_commit_id);
7238 	if (err)
7239 		goto done;
7240 	err = got_ref_write(*tmp_branch, repo);
7241 	if (err)
7242 		goto done;
7243 
7244 	err = got_worktree_set_head_ref(worktree, *tmp_branch);
7245 	if (err)
7246 		goto done;
7247 done:
7248 	free(fileindex_path);
7249 	free(tmp_branch_name);
7250 	free(branch_ref_name);
7251 	free(base_commit_ref_name);
7252 	if (wt_branch)
7253 		got_ref_close(wt_branch);
7254 	if (err) {
7255 		if (*branch_ref) {
7256 			got_ref_close(*branch_ref);
7257 			*branch_ref = NULL;
7258 		}
7259 		if (*tmp_branch) {
7260 			got_ref_close(*tmp_branch);
7261 			*tmp_branch = NULL;
7262 		}
7263 		free(*base_commit_id);
7264 		if (*fileindex) {
7265 			got_fileindex_free(*fileindex);
7266 			*fileindex = NULL;
7267 		}
7268 		lock_worktree(worktree, LOCK_SH);
7269 	}
7270 	return err;
7271 }
7272 
7273 const struct got_error *
7274 got_worktree_histedit_postpone(struct got_worktree *worktree,
7275     struct got_fileindex *fileindex)
7276 {
7277 	if (fileindex)
7278 		got_fileindex_free(fileindex);
7279 	return lock_worktree(worktree, LOCK_SH);
7280 }
7281 
7282 const struct got_error *
7283 got_worktree_histedit_in_progress(int *in_progress,
7284     struct got_worktree *worktree)
7285 {
7286 	const struct got_error *err;
7287 	char *tmp_branch_name = NULL;
7288 
7289 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7290 	if (err)
7291 		return err;
7292 
7293 	*in_progress = (strcmp(tmp_branch_name, worktree->head_ref_name) == 0);
7294 	free(tmp_branch_name);
7295 	return NULL;
7296 }
7297 
7298 const struct got_error *
7299 got_worktree_histedit_continue(struct got_object_id **commit_id,
7300     struct got_reference **tmp_branch, struct got_reference **branch_ref,
7301     struct got_object_id **base_commit_id, struct got_fileindex **fileindex,
7302     struct got_worktree *worktree, struct got_repository *repo)
7303 {
7304 	const struct got_error *err;
7305 	char *commit_ref_name = NULL, *base_commit_ref_name = NULL;
7306 	char *tmp_branch_name = NULL, *branch_ref_name = NULL;
7307 	struct got_reference *commit_ref = NULL;
7308 	struct got_reference *base_commit_ref = NULL;
7309 	char *fileindex_path = NULL;
7310 	int have_staged_files = 0;
7311 
7312 	*commit_id = NULL;
7313 	*tmp_branch = NULL;
7314 	*base_commit_id = NULL;
7315 	*fileindex = NULL;
7316 
7317 	err = lock_worktree(worktree, LOCK_EX);
7318 	if (err)
7319 		return err;
7320 
7321 	err = open_fileindex(fileindex, &fileindex_path, worktree);
7322 	if (err)
7323 		goto done;
7324 
7325 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
7326 	    &have_staged_files);
7327 	if (err && err->code != GOT_ERR_CANCELLED)
7328 		goto done;
7329 	if (have_staged_files) {
7330 		err = got_error(GOT_ERR_STAGED_PATHS);
7331 		goto done;
7332 	}
7333 
7334 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7335 	if (err)
7336 		goto done;
7337 
7338 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7339 	if (err)
7340 		goto done;
7341 
7342 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7343 	if (err)
7344 		goto done;
7345 
7346 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7347 	    worktree);
7348 	if (err)
7349 		goto done;
7350 
7351 	err = got_ref_open(branch_ref, repo, branch_ref_name, 0);
7352 	if (err)
7353 		goto done;
7354 
7355 	err = got_ref_open(&commit_ref, repo, commit_ref_name, 0);
7356 	if (err)
7357 		goto done;
7358 	err = got_ref_resolve(commit_id, repo, commit_ref);
7359 	if (err)
7360 		goto done;
7361 
7362 	err = got_ref_open(&base_commit_ref, repo, base_commit_ref_name, 0);
7363 	if (err)
7364 		goto done;
7365 	err = got_ref_resolve(base_commit_id, repo, base_commit_ref);
7366 	if (err)
7367 		goto done;
7368 
7369 	err = got_ref_open(tmp_branch, repo, tmp_branch_name, 0);
7370 	if (err)
7371 		goto done;
7372 done:
7373 	free(commit_ref_name);
7374 	free(branch_ref_name);
7375 	free(fileindex_path);
7376 	if (commit_ref)
7377 		got_ref_close(commit_ref);
7378 	if (base_commit_ref)
7379 		got_ref_close(base_commit_ref);
7380 	if (err) {
7381 		free(*commit_id);
7382 		*commit_id = NULL;
7383 		free(*base_commit_id);
7384 		*base_commit_id = NULL;
7385 		if (*tmp_branch) {
7386 			got_ref_close(*tmp_branch);
7387 			*tmp_branch = NULL;
7388 		}
7389 		if (*fileindex) {
7390 			got_fileindex_free(*fileindex);
7391 			*fileindex = NULL;
7392 		}
7393 		lock_worktree(worktree, LOCK_EX);
7394 	}
7395 	return err;
7396 }
7397 
7398 static const struct got_error *
7399 delete_histedit_refs(struct got_worktree *worktree, struct got_repository *repo)
7400 {
7401 	const struct got_error *err;
7402 	char *tmp_branch_name = NULL, *base_commit_ref_name = NULL;
7403 	char *branch_ref_name = NULL, *commit_ref_name = NULL;
7404 
7405 	err = get_histedit_tmp_ref_name(&tmp_branch_name, worktree);
7406 	if (err)
7407 		goto done;
7408 	err = delete_ref(tmp_branch_name, repo);
7409 	if (err)
7410 		goto done;
7411 
7412 	err = get_histedit_base_commit_ref_name(&base_commit_ref_name,
7413 	    worktree);
7414 	if (err)
7415 		goto done;
7416 	err = delete_ref(base_commit_ref_name, repo);
7417 	if (err)
7418 		goto done;
7419 
7420 	err = get_histedit_branch_symref_name(&branch_ref_name, worktree);
7421 	if (err)
7422 		goto done;
7423 	err = delete_ref(branch_ref_name, repo);
7424 	if (err)
7425 		goto done;
7426 
7427 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7428 	if (err)
7429 		goto done;
7430 	err = delete_ref(commit_ref_name, repo);
7431 	if (err)
7432 		goto done;
7433 done:
7434 	free(tmp_branch_name);
7435 	free(base_commit_ref_name);
7436 	free(branch_ref_name);
7437 	free(commit_ref_name);
7438 	return err;
7439 }
7440 
7441 const struct got_error *
7442 got_worktree_histedit_abort(struct got_worktree *worktree,
7443     struct got_fileindex *fileindex, struct got_repository *repo,
7444     struct got_reference *branch, struct got_object_id *base_commit_id,
7445     got_worktree_checkout_cb progress_cb, void *progress_arg)
7446 {
7447 	const struct got_error *err, *unlockerr, *sync_err;
7448 	struct got_reference *resolved = NULL;
7449 	char *fileindex_path = NULL;
7450 	struct got_commit_object *commit = NULL;
7451 	struct got_object_id *tree_id = NULL;
7452 	struct revert_file_args rfa;
7453 
7454 	err = lock_worktree(worktree, LOCK_EX);
7455 	if (err)
7456 		return err;
7457 
7458 	err = got_object_open_as_commit(&commit, repo,
7459 	    worktree->base_commit_id);
7460 	if (err)
7461 		goto done;
7462 
7463 	err = got_ref_open(&resolved, repo,
7464 	    got_ref_get_symref_target(branch), 0);
7465 	if (err)
7466 		goto done;
7467 
7468 	err = got_worktree_set_head_ref(worktree, resolved);
7469 	if (err)
7470 		goto done;
7471 
7472 	err = got_worktree_set_base_commit_id(worktree, repo, base_commit_id);
7473 	if (err)
7474 		goto done;
7475 
7476 	err = got_object_id_by_path(&tree_id, repo, commit,
7477 	    worktree->path_prefix);
7478 	if (err)
7479 		goto done;
7480 
7481 	err = delete_histedit_refs(worktree, repo);
7482 	if (err)
7483 		goto done;
7484 
7485 	err = get_fileindex_path(&fileindex_path, worktree);
7486 	if (err)
7487 		goto done;
7488 
7489 	rfa.worktree = worktree;
7490 	rfa.fileindex = fileindex;
7491 	rfa.progress_cb = progress_cb;
7492 	rfa.progress_arg = progress_arg;
7493 	rfa.patch_cb = NULL;
7494 	rfa.patch_arg = NULL;
7495 	rfa.repo = repo;
7496 	rfa.unlink_added_files = 0;
7497 	err = worktree_status(worktree, "", fileindex, repo,
7498 	    revert_file, &rfa, NULL, NULL, 1, 0);
7499 	if (err)
7500 		goto sync;
7501 
7502 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
7503 	    repo, progress_cb, progress_arg, NULL, NULL);
7504 sync:
7505 	sync_err = sync_fileindex(fileindex, fileindex_path);
7506 	if (sync_err && err == NULL)
7507 		err = sync_err;
7508 done:
7509 	got_ref_close(resolved);
7510 	free(tree_id);
7511 	free(fileindex_path);
7512 
7513 	unlockerr = lock_worktree(worktree, LOCK_SH);
7514 	if (unlockerr && err == NULL)
7515 		err = unlockerr;
7516 	return err;
7517 }
7518 
7519 const struct got_error *
7520 got_worktree_histedit_complete(struct got_worktree *worktree,
7521     struct got_fileindex *fileindex, struct got_reference *tmp_branch,
7522     struct got_reference *edited_branch, struct got_repository *repo)
7523 {
7524 	const struct got_error *err, *unlockerr, *sync_err;
7525 	struct got_object_id *new_head_commit_id = NULL;
7526 	struct got_reference *resolved = NULL;
7527 	char *fileindex_path = NULL;
7528 
7529 	err = got_ref_resolve(&new_head_commit_id, repo, tmp_branch);
7530 	if (err)
7531 		return err;
7532 
7533 	err = got_ref_open(&resolved, repo,
7534 	    got_ref_get_symref_target(edited_branch), 0);
7535 	if (err)
7536 		goto done;
7537 
7538 	err = create_backup_ref(GOT_WORKTREE_HISTEDIT_BACKUP_REF_PREFIX,
7539 	    resolved, new_head_commit_id, repo);
7540 	if (err)
7541 		goto done;
7542 
7543 	err = got_ref_change_ref(resolved, new_head_commit_id);
7544 	if (err)
7545 		goto done;
7546 
7547 	err = got_ref_write(resolved, repo);
7548 	if (err)
7549 		goto done;
7550 
7551 	err = got_worktree_set_head_ref(worktree, resolved);
7552 	if (err)
7553 		goto done;
7554 
7555 	err = delete_histedit_refs(worktree, repo);
7556 	if (err)
7557 		goto done;
7558 
7559 	err = get_fileindex_path(&fileindex_path, worktree);
7560 	if (err)
7561 		goto done;
7562 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7563 	sync_err = sync_fileindex(fileindex, fileindex_path);
7564 	if (sync_err && err == NULL)
7565 		err = sync_err;
7566 done:
7567 	got_fileindex_free(fileindex);
7568 	free(fileindex_path);
7569 	free(new_head_commit_id);
7570 	unlockerr = lock_worktree(worktree, LOCK_SH);
7571 	if (unlockerr && err == NULL)
7572 		err = unlockerr;
7573 	return err;
7574 }
7575 
7576 const struct got_error *
7577 got_worktree_histedit_skip_commit(struct got_worktree *worktree,
7578     struct got_object_id *commit_id, struct got_repository *repo)
7579 {
7580 	const struct got_error *err;
7581 	char *commit_ref_name;
7582 
7583 	err = get_histedit_commit_ref_name(&commit_ref_name, worktree);
7584 	if (err)
7585 		return err;
7586 
7587 	err = store_commit_id(commit_ref_name, commit_id, 0, repo);
7588 	if (err)
7589 		goto done;
7590 
7591 	err = delete_ref(commit_ref_name, repo);
7592 done:
7593 	free(commit_ref_name);
7594 	return err;
7595 }
7596 
7597 const struct got_error *
7598 got_worktree_integrate_prepare(struct got_fileindex **fileindex,
7599     struct got_reference **branch_ref, struct got_reference **base_branch_ref,
7600     struct got_worktree *worktree, const char *refname,
7601     struct got_repository *repo)
7602 {
7603 	const struct got_error *err = NULL;
7604 	char *fileindex_path = NULL;
7605 	struct check_rebase_ok_arg ok_arg;
7606 
7607 	*fileindex = NULL;
7608 	*branch_ref = NULL;
7609 	*base_branch_ref = NULL;
7610 
7611 	err = lock_worktree(worktree, LOCK_EX);
7612 	if (err)
7613 		return err;
7614 
7615 	if (strcmp(refname, got_worktree_get_head_ref_name(worktree)) == 0) {
7616 		err = got_error_msg(GOT_ERR_SAME_BRANCH,
7617 		    "cannot integrate a branch into itself; "
7618 		    "update -b or different branch name required");
7619 		goto done;
7620 	}
7621 
7622 	err = open_fileindex(fileindex, &fileindex_path, worktree);
7623 	if (err)
7624 		goto done;
7625 
7626 	/* Preconditions are the same as for rebase. */
7627 	ok_arg.worktree = worktree;
7628 	ok_arg.repo = repo;
7629 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
7630 	    &ok_arg);
7631 	if (err)
7632 		goto done;
7633 
7634 	err = got_ref_open(branch_ref, repo, refname, 1);
7635 	if (err)
7636 		goto done;
7637 
7638 	err = got_ref_open(base_branch_ref, repo,
7639 	    got_worktree_get_head_ref_name(worktree), 1);
7640 done:
7641 	if (err) {
7642 		if (*branch_ref) {
7643 			got_ref_close(*branch_ref);
7644 			*branch_ref = NULL;
7645 		}
7646 		if (*base_branch_ref) {
7647 			got_ref_close(*base_branch_ref);
7648 			*base_branch_ref = NULL;
7649 		}
7650 		if (*fileindex) {
7651 			got_fileindex_free(*fileindex);
7652 			*fileindex = NULL;
7653 		}
7654 		lock_worktree(worktree, LOCK_SH);
7655 	}
7656 	return err;
7657 }
7658 
7659 const struct got_error *
7660 got_worktree_integrate_continue(struct got_worktree *worktree,
7661     struct got_fileindex *fileindex, struct got_repository *repo,
7662     struct got_reference *branch_ref, struct got_reference *base_branch_ref,
7663     got_worktree_checkout_cb progress_cb, void *progress_arg,
7664     got_cancel_cb cancel_cb, void *cancel_arg)
7665 {
7666 	const struct got_error *err = NULL, *sync_err, *unlockerr;
7667 	char *fileindex_path = NULL;
7668 	struct got_object_id *tree_id = NULL, *commit_id = NULL;
7669 	struct got_commit_object *commit =  NULL;
7670 
7671 	err = get_fileindex_path(&fileindex_path, worktree);
7672 	if (err)
7673 		goto done;
7674 
7675 	err = got_ref_resolve(&commit_id, repo, branch_ref);
7676 	if (err)
7677 		goto done;
7678 
7679 	err = got_object_open_as_commit(&commit, repo, commit_id);
7680 	if (err)
7681 		goto done;
7682 
7683 	err = got_object_id_by_path(&tree_id, repo, commit,
7684 	    worktree->path_prefix);
7685 	if (err)
7686 		goto done;
7687 
7688 	err = got_worktree_set_base_commit_id(worktree, repo, commit_id);
7689 	if (err)
7690 		goto done;
7691 
7692 	err = checkout_files(worktree, fileindex, "", tree_id, NULL, repo,
7693 	    progress_cb, progress_arg, cancel_cb, cancel_arg);
7694 	if (err)
7695 		goto sync;
7696 
7697 	err = got_ref_change_ref(base_branch_ref, commit_id);
7698 	if (err)
7699 		goto sync;
7700 
7701 	err = got_ref_write(base_branch_ref, repo);
7702 	if (err)
7703 		goto sync;
7704 
7705 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7706 sync:
7707 	sync_err = sync_fileindex(fileindex, fileindex_path);
7708 	if (sync_err && err == NULL)
7709 		err = sync_err;
7710 
7711 done:
7712 	unlockerr = got_ref_unlock(branch_ref);
7713 	if (unlockerr && err == NULL)
7714 		err = unlockerr;
7715 	got_ref_close(branch_ref);
7716 
7717 	unlockerr = got_ref_unlock(base_branch_ref);
7718 	if (unlockerr && err == NULL)
7719 		err = unlockerr;
7720 	got_ref_close(base_branch_ref);
7721 
7722 	got_fileindex_free(fileindex);
7723 	free(fileindex_path);
7724 	free(tree_id);
7725 	if (commit)
7726 		got_object_commit_close(commit);
7727 
7728 	unlockerr = lock_worktree(worktree, LOCK_SH);
7729 	if (unlockerr && err == NULL)
7730 		err = unlockerr;
7731 	return err;
7732 }
7733 
7734 const struct got_error *
7735 got_worktree_integrate_abort(struct got_worktree *worktree,
7736     struct got_fileindex *fileindex, struct got_repository *repo,
7737     struct got_reference *branch_ref, struct got_reference *base_branch_ref)
7738 {
7739 	const struct got_error *err = NULL, *unlockerr = NULL;
7740 
7741 	got_fileindex_free(fileindex);
7742 
7743 	err = lock_worktree(worktree, LOCK_SH);
7744 
7745 	unlockerr = got_ref_unlock(branch_ref);
7746 	if (unlockerr && err == NULL)
7747 		err = unlockerr;
7748 	got_ref_close(branch_ref);
7749 
7750 	unlockerr = got_ref_unlock(base_branch_ref);
7751 	if (unlockerr && err == NULL)
7752 		err = unlockerr;
7753 	got_ref_close(base_branch_ref);
7754 
7755 	return err;
7756 }
7757 
7758 const struct got_error *
7759 got_worktree_merge_postpone(struct got_worktree *worktree,
7760     struct got_fileindex *fileindex)
7761 {
7762 	const struct got_error *err, *sync_err;
7763 	char *fileindex_path = NULL;
7764 
7765 	err = get_fileindex_path(&fileindex_path, worktree);
7766 	if (err)
7767 		goto done;
7768 
7769 	sync_err = sync_fileindex(fileindex, fileindex_path);
7770 
7771 	err = lock_worktree(worktree, LOCK_SH);
7772 	if (sync_err && err == NULL)
7773 		err = sync_err;
7774 done:
7775 	got_fileindex_free(fileindex);
7776 	free(fileindex_path);
7777 	return err;
7778 }
7779 
7780 static const struct got_error *
7781 delete_merge_refs(struct got_worktree *worktree, struct got_repository *repo)
7782 {
7783 	const struct got_error *err;
7784 	char *branch_refname = NULL, *commit_refname = NULL;
7785 
7786 	err = get_merge_branch_ref_name(&branch_refname, worktree);
7787 	if (err)
7788 		goto done;
7789 	err = delete_ref(branch_refname, repo);
7790 	if (err)
7791 		goto done;
7792 
7793 	err = get_merge_commit_ref_name(&commit_refname, worktree);
7794 	if (err)
7795 		goto done;
7796 	err = delete_ref(commit_refname, repo);
7797 	if (err)
7798 		goto done;
7799 
7800 done:
7801 	free(branch_refname);
7802 	free(commit_refname);
7803 	return err;
7804 }
7805 
7806 struct merge_commit_msg_arg {
7807 	struct got_worktree *worktree;
7808 	const char *branch_name;
7809 };
7810 
7811 static const struct got_error *
7812 merge_commit_msg_cb(struct got_pathlist_head *commitable_paths,
7813     const char *diff_path, char **logmsg, void *arg)
7814 {
7815 	struct merge_commit_msg_arg *a = arg;
7816 
7817 	if (asprintf(logmsg, "merge %s into %s\n", a->branch_name,
7818 	    got_worktree_get_head_ref_name(a->worktree)) == -1)
7819 		return got_error_from_errno("asprintf");
7820 
7821 	return NULL;
7822 }
7823 
7824 
7825 const struct got_error *
7826 got_worktree_merge_branch(struct got_worktree *worktree,
7827     struct got_fileindex *fileindex,
7828     struct got_object_id *yca_commit_id,
7829     struct got_object_id *branch_tip,
7830     struct got_repository *repo, got_worktree_checkout_cb progress_cb,
7831     void *progress_arg, got_cancel_cb cancel_cb, void *cancel_arg)
7832 {
7833 	const struct got_error *err;
7834 	char *fileindex_path = NULL;
7835 
7836 	err = get_fileindex_path(&fileindex_path, worktree);
7837 	if (err)
7838 		goto done;
7839 
7840 	err = got_fileindex_for_each_entry_safe(fileindex, check_mixed_commits,
7841 	    worktree);
7842 	if (err)
7843 		goto done;
7844 
7845 	err = merge_files(worktree, fileindex, fileindex_path, yca_commit_id,
7846 	    branch_tip, repo, progress_cb, progress_arg,
7847 	    cancel_cb, cancel_arg);
7848 done:
7849 	free(fileindex_path);
7850 	return err;
7851 }
7852 
7853 const struct got_error *
7854 got_worktree_merge_commit(struct got_object_id **new_commit_id,
7855     struct got_worktree *worktree, struct got_fileindex *fileindex,
7856     const char *author, const char *committer, int allow_bad_symlinks,
7857     struct got_object_id *branch_tip, const char *branch_name,
7858     struct got_repository *repo,
7859     got_worktree_status_cb status_cb, void *status_arg)
7860 
7861 {
7862 	const struct got_error *err = NULL, *sync_err;
7863 	struct got_pathlist_head commitable_paths;
7864 	struct collect_commitables_arg cc_arg;
7865 	struct got_pathlist_entry *pe;
7866 	struct got_reference *head_ref = NULL;
7867 	struct got_object_id *head_commit_id = NULL;
7868 	int have_staged_files = 0;
7869 	struct merge_commit_msg_arg mcm_arg;
7870 	char *fileindex_path = NULL;
7871 
7872 	memset(&cc_arg, 0, sizeof(cc_arg));
7873 	*new_commit_id = NULL;
7874 
7875 	TAILQ_INIT(&commitable_paths);
7876 
7877 	err = get_fileindex_path(&fileindex_path, worktree);
7878 	if (err)
7879 		goto done;
7880 
7881 	err = got_ref_open(&head_ref, repo, worktree->head_ref_name, 0);
7882 	if (err)
7883 		goto done;
7884 
7885 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
7886 	if (err)
7887 		goto done;
7888 
7889 	err = got_fileindex_for_each_entry_safe(fileindex, check_staged_file,
7890 	    &have_staged_files);
7891 	if (err && err->code != GOT_ERR_CANCELLED)
7892 		goto done;
7893 	if (have_staged_files) {
7894 		err = got_error(GOT_ERR_MERGE_STAGED_PATHS);
7895 		goto done;
7896 	}
7897 
7898 	cc_arg.commitable_paths = &commitable_paths;
7899 	cc_arg.worktree = worktree;
7900 	cc_arg.fileindex = fileindex;
7901 	cc_arg.repo = repo;
7902 	cc_arg.have_staged_files = have_staged_files;
7903 	cc_arg.allow_bad_symlinks = allow_bad_symlinks;
7904 	err = worktree_status(worktree, "", fileindex, repo,
7905 	    collect_commitables, &cc_arg, NULL, NULL, 1, 0);
7906 	if (err)
7907 		goto done;
7908 
7909 	if (TAILQ_EMPTY(&commitable_paths)) {
7910 		err = got_error_fmt(GOT_ERR_COMMIT_NO_CHANGES,
7911 		    "merge of %s cannot proceed", branch_name);
7912 		goto done;
7913 	}
7914 
7915 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
7916 		struct got_commitable *ct = pe->data;
7917 		const char *ct_path = ct->in_repo_path;
7918 
7919 		while (ct_path[0] == '/')
7920 			ct_path++;
7921 		err = check_out_of_date(ct_path, ct->status,
7922 		    ct->staged_status, ct->base_blob_id, ct->base_commit_id,
7923 		    head_commit_id, repo, GOT_ERR_MERGE_COMMIT_OUT_OF_DATE);
7924 		if (err)
7925 			goto done;
7926 
7927 	}
7928 
7929 	mcm_arg.worktree = worktree;
7930 	mcm_arg.branch_name = branch_name;
7931 	err = commit_worktree(new_commit_id, &commitable_paths,
7932 	    head_commit_id, branch_tip, worktree, author, committer, NULL,
7933 	    merge_commit_msg_cb, &mcm_arg, status_cb, status_arg, repo);
7934 	if (err)
7935 		goto done;
7936 
7937 	err = update_fileindex_after_commit(worktree, &commitable_paths,
7938 	    *new_commit_id, fileindex, have_staged_files);
7939 	sync_err = sync_fileindex(fileindex, fileindex_path);
7940 	if (sync_err && err == NULL)
7941 		err = sync_err;
7942 done:
7943 	TAILQ_FOREACH(pe, &commitable_paths, entry) {
7944 		struct got_commitable *ct = pe->data;
7945 		free_commitable(ct);
7946 	}
7947 	got_pathlist_free(&commitable_paths);
7948 	free(fileindex_path);
7949 	return err;
7950 }
7951 
7952 const struct got_error *
7953 got_worktree_merge_complete(struct got_worktree *worktree,
7954     struct got_fileindex *fileindex, struct got_repository *repo)
7955 {
7956 	const struct got_error *err, *unlockerr, *sync_err;
7957 	char *fileindex_path = NULL;
7958 
7959 	err = delete_merge_refs(worktree, repo);
7960 	if (err)
7961 		goto done;
7962 
7963 	err = get_fileindex_path(&fileindex_path, worktree);
7964 	if (err)
7965 		goto done;
7966 	err = bump_base_commit_id_everywhere(worktree, fileindex, NULL, NULL);
7967 	sync_err = sync_fileindex(fileindex, fileindex_path);
7968 	if (sync_err && err == NULL)
7969 		err = sync_err;
7970 done:
7971 	got_fileindex_free(fileindex);
7972 	free(fileindex_path);
7973 	unlockerr = lock_worktree(worktree, LOCK_SH);
7974 	if (unlockerr && err == NULL)
7975 		err = unlockerr;
7976 	return err;
7977 }
7978 
7979 const struct got_error *
7980 got_worktree_merge_in_progress(int *in_progress, struct got_worktree *worktree,
7981     struct got_repository *repo)
7982 {
7983 	const struct got_error *err;
7984 	char *branch_refname = NULL;
7985 	struct got_reference *branch_ref = NULL;
7986 
7987 	*in_progress = 0;
7988 
7989 	err = get_merge_branch_ref_name(&branch_refname, worktree);
7990 	if (err)
7991 		return err;
7992 	err = got_ref_open(&branch_ref, repo, branch_refname, 0);
7993 	free(branch_refname);
7994 	if (err) {
7995 		if (err->code != GOT_ERR_NOT_REF)
7996 			return err;
7997 	} else
7998 		*in_progress = 1;
7999 
8000 	return NULL;
8001 }
8002 
8003 const struct got_error *got_worktree_merge_prepare(
8004     struct got_fileindex **fileindex, struct got_worktree *worktree,
8005     struct got_reference *branch, struct got_repository *repo)
8006 {
8007 	const struct got_error *err = NULL;
8008 	char *fileindex_path = NULL;
8009 	char *branch_refname = NULL, *commit_refname = NULL;
8010 	struct got_reference *wt_branch = NULL, *branch_ref = NULL;
8011 	struct got_reference *commit_ref = NULL;
8012 	struct got_object_id *branch_tip = NULL, *wt_branch_tip = NULL;
8013 	struct check_rebase_ok_arg ok_arg;
8014 
8015 	*fileindex = NULL;
8016 
8017 	err = lock_worktree(worktree, LOCK_EX);
8018 	if (err)
8019 		return err;
8020 
8021 	err = open_fileindex(fileindex, &fileindex_path, worktree);
8022 	if (err)
8023 		goto done;
8024 
8025 	/* Preconditions are the same as for rebase. */
8026 	ok_arg.worktree = worktree;
8027 	ok_arg.repo = repo;
8028 	err = got_fileindex_for_each_entry_safe(*fileindex, check_rebase_ok,
8029 	    &ok_arg);
8030 	if (err)
8031 		goto done;
8032 
8033 	err = get_merge_branch_ref_name(&branch_refname, worktree);
8034 	if (err)
8035 		return err;
8036 
8037 	err = get_merge_commit_ref_name(&commit_refname, worktree);
8038 	if (err)
8039 		return err;
8040 
8041 	err = got_ref_open(&wt_branch, repo, worktree->head_ref_name,
8042 	    0);
8043 	if (err)
8044 		goto done;
8045 
8046 	err = got_ref_resolve(&wt_branch_tip, repo, wt_branch);
8047 	if (err)
8048 		goto done;
8049 
8050 	if (got_object_id_cmp(worktree->base_commit_id, wt_branch_tip) != 0) {
8051 		err = got_error(GOT_ERR_MERGE_OUT_OF_DATE);
8052 		goto done;
8053 	}
8054 
8055 	err = got_ref_resolve(&branch_tip, repo, branch);
8056 	if (err)
8057 		goto done;
8058 
8059 	err = got_ref_alloc_symref(&branch_ref, branch_refname, branch);
8060 	if (err)
8061 		goto done;
8062 	err = got_ref_write(branch_ref, repo);
8063 	if (err)
8064 		goto done;
8065 
8066 	err = got_ref_alloc(&commit_ref, commit_refname, branch_tip);
8067 	if (err)
8068 		goto done;
8069 	err = got_ref_write(commit_ref, repo);
8070 	if (err)
8071 		goto done;
8072 
8073 done:
8074 	free(branch_refname);
8075 	free(commit_refname);
8076 	free(fileindex_path);
8077 	if (branch_ref)
8078 		got_ref_close(branch_ref);
8079 	if (commit_ref)
8080 		got_ref_close(commit_ref);
8081 	if (wt_branch)
8082 		got_ref_close(wt_branch);
8083 	free(wt_branch_tip);
8084 	if (err) {
8085 		if (*fileindex) {
8086 			got_fileindex_free(*fileindex);
8087 			*fileindex = NULL;
8088 		}
8089 		lock_worktree(worktree, LOCK_SH);
8090 	}
8091 	return err;
8092 }
8093 
8094 const struct got_error *
8095 got_worktree_merge_continue(char **branch_name,
8096     struct got_object_id **branch_tip, struct got_fileindex **fileindex,
8097     struct got_worktree *worktree, struct got_repository *repo)
8098 {
8099 	const struct got_error *err;
8100 	char *commit_refname = NULL, *branch_refname = NULL;
8101 	struct got_reference *commit_ref = NULL, *branch_ref = NULL;
8102 	char *fileindex_path = NULL;
8103 	int have_staged_files = 0;
8104 
8105 	*branch_name = NULL;
8106 	*branch_tip = NULL;
8107 	*fileindex = NULL;
8108 
8109 	err = lock_worktree(worktree, LOCK_EX);
8110 	if (err)
8111 		return err;
8112 
8113 	err = open_fileindex(fileindex, &fileindex_path, worktree);
8114 	if (err)
8115 		goto done;
8116 
8117 	err = got_fileindex_for_each_entry_safe(*fileindex, check_staged_file,
8118 	    &have_staged_files);
8119 	if (err && err->code != GOT_ERR_CANCELLED)
8120 		goto done;
8121 	if (have_staged_files) {
8122 		err = got_error(GOT_ERR_STAGED_PATHS);
8123 		goto done;
8124 	}
8125 
8126 	err = get_merge_branch_ref_name(&branch_refname, worktree);
8127 	if (err)
8128 		goto done;
8129 
8130 	err = get_merge_commit_ref_name(&commit_refname, worktree);
8131 	if (err)
8132 		goto done;
8133 
8134 	err = got_ref_open(&branch_ref, repo, branch_refname, 0);
8135 	if (err)
8136 		goto done;
8137 
8138 	if (!got_ref_is_symbolic(branch_ref)) {
8139 		err = got_error_fmt(GOT_ERR_BAD_REF_TYPE,
8140 		    "%s is not a symbolic reference",
8141 		    got_ref_get_name(branch_ref));
8142 		goto done;
8143 	}
8144 	*branch_name = strdup(got_ref_get_symref_target(branch_ref));
8145 	if (*branch_name == NULL) {
8146 		err = got_error_from_errno("strdup");
8147 		goto done;
8148 	}
8149 
8150 	err = got_ref_open(&commit_ref, repo, commit_refname, 0);
8151 	if (err)
8152 		goto done;
8153 
8154 	err = got_ref_resolve(branch_tip, repo, commit_ref);
8155 	if (err)
8156 		goto done;
8157 done:
8158 	free(commit_refname);
8159 	free(branch_refname);
8160 	free(fileindex_path);
8161 	if (commit_ref)
8162 		got_ref_close(commit_ref);
8163 	if (branch_ref)
8164 		got_ref_close(branch_ref);
8165 	if (err) {
8166 		if (*branch_name) {
8167 			free(*branch_name);
8168 			*branch_name = NULL;
8169 		}
8170 		free(*branch_tip);
8171 		*branch_tip = NULL;
8172 		if (*fileindex) {
8173 			got_fileindex_free(*fileindex);
8174 			*fileindex = NULL;
8175 		}
8176 		lock_worktree(worktree, LOCK_SH);
8177 	}
8178 	return err;
8179 }
8180 
8181 const struct got_error *
8182 got_worktree_merge_abort(struct got_worktree *worktree,
8183     struct got_fileindex *fileindex, struct got_repository *repo,
8184     got_worktree_checkout_cb progress_cb, void *progress_arg)
8185 {
8186 	const struct got_error *err, *unlockerr, *sync_err;
8187 	struct got_object_id *commit_id = NULL;
8188 	struct got_commit_object *commit = NULL;
8189 	char *fileindex_path = NULL;
8190 	struct revert_file_args rfa;
8191 	struct got_object_id *tree_id = NULL;
8192 
8193 	err = got_object_open_as_commit(&commit, repo,
8194 	    worktree->base_commit_id);
8195 	if (err)
8196 		goto done;
8197 
8198 	err = got_object_id_by_path(&tree_id, repo, commit,
8199 	    worktree->path_prefix);
8200 	if (err)
8201 		goto done;
8202 
8203 	err = delete_merge_refs(worktree, repo);
8204 	if (err)
8205 		goto done;
8206 
8207 	err = get_fileindex_path(&fileindex_path, worktree);
8208 	if (err)
8209 		goto done;
8210 
8211 	rfa.worktree = worktree;
8212 	rfa.fileindex = fileindex;
8213 	rfa.progress_cb = progress_cb;
8214 	rfa.progress_arg = progress_arg;
8215 	rfa.patch_cb = NULL;
8216 	rfa.patch_arg = NULL;
8217 	rfa.repo = repo;
8218 	rfa.unlink_added_files = 1;
8219 	err = worktree_status(worktree, "", fileindex, repo,
8220 	    revert_file, &rfa, NULL, NULL, 1, 0);
8221 	if (err)
8222 		goto sync;
8223 
8224 	err = checkout_files(worktree, fileindex, "", tree_id, NULL,
8225 	    repo, progress_cb, progress_arg, NULL, NULL);
8226 sync:
8227 	sync_err = sync_fileindex(fileindex, fileindex_path);
8228 	if (sync_err && err == NULL)
8229 		err = sync_err;
8230 done:
8231 	free(tree_id);
8232 	free(commit_id);
8233 	if (commit)
8234 		got_object_commit_close(commit);
8235 	if (fileindex)
8236 		got_fileindex_free(fileindex);
8237 	free(fileindex_path);
8238 
8239 	unlockerr = lock_worktree(worktree, LOCK_SH);
8240 	if (unlockerr && err == NULL)
8241 		err = unlockerr;
8242 	return err;
8243 }
8244 
8245 struct check_stage_ok_arg {
8246 	struct got_object_id *head_commit_id;
8247 	struct got_worktree *worktree;
8248 	struct got_fileindex *fileindex;
8249 	struct got_repository *repo;
8250 	int have_changes;
8251 };
8252 
8253 static const struct got_error *
8254 check_stage_ok(void *arg, unsigned char status,
8255     unsigned char staged_status, const char *relpath,
8256     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8257     struct got_object_id *commit_id, int dirfd, const char *de_name)
8258 {
8259 	struct check_stage_ok_arg *a = arg;
8260 	const struct got_error *err = NULL;
8261 	struct got_fileindex_entry *ie;
8262 	struct got_object_id base_commit_id;
8263 	struct got_object_id *base_commit_idp = NULL;
8264 	char *in_repo_path = NULL, *p;
8265 
8266 	if (status == GOT_STATUS_UNVERSIONED ||
8267 	    status == GOT_STATUS_NO_CHANGE)
8268 		return NULL;
8269 	if (status == GOT_STATUS_NONEXISTENT)
8270 		return got_error_set_errno(ENOENT, relpath);
8271 
8272 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8273 	if (ie == NULL)
8274 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8275 
8276 	if (asprintf(&in_repo_path, "%s%s%s", a->worktree->path_prefix,
8277 	    got_path_is_root_dir(a->worktree->path_prefix) ? "" : "/",
8278 	    relpath) == -1)
8279 		return got_error_from_errno("asprintf");
8280 
8281 	if (got_fileindex_entry_has_commit(ie)) {
8282 		memcpy(base_commit_id.sha1, ie->commit_sha1,
8283 		    SHA1_DIGEST_LENGTH);
8284 		base_commit_idp = &base_commit_id;
8285 	}
8286 
8287 	if (status == GOT_STATUS_CONFLICT) {
8288 		err = got_error_path(ie->path, GOT_ERR_STAGE_CONFLICT);
8289 		goto done;
8290 	} else if (status != GOT_STATUS_ADD &&
8291 	    status != GOT_STATUS_MODIFY &&
8292 	    status != GOT_STATUS_DELETE) {
8293 		err = got_error_path(ie->path, GOT_ERR_FILE_STATUS);
8294 		goto done;
8295 	}
8296 
8297 	a->have_changes = 1;
8298 
8299 	p = in_repo_path;
8300 	while (p[0] == '/')
8301 		p++;
8302 	err = check_out_of_date(p, status, staged_status,
8303 	    blob_id, base_commit_idp, a->head_commit_id, a->repo,
8304 	    GOT_ERR_STAGE_OUT_OF_DATE);
8305 done:
8306 	free(in_repo_path);
8307 	return err;
8308 }
8309 
8310 struct stage_path_arg {
8311 	struct got_worktree *worktree;
8312 	struct got_fileindex *fileindex;
8313 	struct got_repository *repo;
8314 	got_worktree_status_cb status_cb;
8315 	void *status_arg;
8316 	got_worktree_patch_cb patch_cb;
8317 	void *patch_arg;
8318 	int staged_something;
8319 	int allow_bad_symlinks;
8320 };
8321 
8322 static const struct got_error *
8323 stage_path(void *arg, unsigned char status,
8324     unsigned char staged_status, const char *relpath,
8325     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8326     struct got_object_id *commit_id, int dirfd, const char *de_name)
8327 {
8328 	struct stage_path_arg *a = arg;
8329 	const struct got_error *err = NULL;
8330 	struct got_fileindex_entry *ie;
8331 	char *ondisk_path = NULL, *path_content = NULL;
8332 	uint32_t stage;
8333 	struct got_object_id *new_staged_blob_id = NULL;
8334 	struct stat sb;
8335 
8336 	if (status == GOT_STATUS_UNVERSIONED)
8337 		return NULL;
8338 
8339 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8340 	if (ie == NULL)
8341 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8342 
8343 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path,
8344 	    relpath)== -1)
8345 		return got_error_from_errno("asprintf");
8346 
8347 	switch (status) {
8348 	case GOT_STATUS_ADD:
8349 	case GOT_STATUS_MODIFY:
8350 		/* XXX could sb.st_mode be passed in by our caller? */
8351 		if (lstat(ondisk_path, &sb) == -1) {
8352 			err = got_error_from_errno2("lstat", ondisk_path);
8353 			break;
8354 		}
8355 		if (a->patch_cb) {
8356 			if (status == GOT_STATUS_ADD) {
8357 				int choice = GOT_PATCH_CHOICE_NONE;
8358 				err = (*a->patch_cb)(&choice, a->patch_arg,
8359 				    status, ie->path, NULL, 1, 1);
8360 				if (err)
8361 					break;
8362 				if (choice != GOT_PATCH_CHOICE_YES)
8363 					break;
8364 			} else {
8365 				err = create_patched_content(&path_content, 0,
8366 				    staged_blob_id ? staged_blob_id : blob_id,
8367 				    ondisk_path, dirfd, de_name, ie->path,
8368 				    a->repo, a->patch_cb, a->patch_arg);
8369 				if (err || path_content == NULL)
8370 					break;
8371 			}
8372 		}
8373 		err = got_object_blob_create(&new_staged_blob_id,
8374 		    path_content ? path_content : ondisk_path, a->repo);
8375 		if (err)
8376 			break;
8377 		memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8378 		    SHA1_DIGEST_LENGTH);
8379 		if (status == GOT_STATUS_ADD || staged_status == GOT_STATUS_ADD)
8380 			stage = GOT_FILEIDX_STAGE_ADD;
8381 		else
8382 			stage = GOT_FILEIDX_STAGE_MODIFY;
8383 		got_fileindex_entry_stage_set(ie, stage);
8384 		if (S_ISLNK(sb.st_mode)) {
8385 			int is_bad_symlink = 0;
8386 			if (!a->allow_bad_symlinks) {
8387 				char target_path[PATH_MAX];
8388 				ssize_t target_len;
8389 				target_len = readlink(ondisk_path, target_path,
8390 				    sizeof(target_path));
8391 				if (target_len == -1) {
8392 					err = got_error_from_errno2("readlink",
8393 					    ondisk_path);
8394 					break;
8395 				}
8396 				err = is_bad_symlink_target(&is_bad_symlink,
8397 				    target_path, target_len, ondisk_path,
8398 				    a->worktree->root_path);
8399 				if (err)
8400 					break;
8401 				if (is_bad_symlink) {
8402 					err = got_error_path(ondisk_path,
8403 					    GOT_ERR_BAD_SYMLINK);
8404 					break;
8405 				}
8406 			}
8407 			if (is_bad_symlink)
8408 				got_fileindex_entry_staged_filetype_set(ie,
8409 				    GOT_FILEIDX_MODE_BAD_SYMLINK);
8410 			else
8411 				got_fileindex_entry_staged_filetype_set(ie,
8412 				    GOT_FILEIDX_MODE_SYMLINK);
8413 		} else {
8414 			got_fileindex_entry_staged_filetype_set(ie,
8415 			    GOT_FILEIDX_MODE_REGULAR_FILE);
8416 		}
8417 		a->staged_something = 1;
8418 		if (a->status_cb == NULL)
8419 			break;
8420 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8421 		    get_staged_status(ie), relpath, blob_id,
8422 		    new_staged_blob_id, NULL, dirfd, de_name);
8423 		if (err)
8424 			break;
8425 		/*
8426 		 * When staging the reverse of the staged diff,
8427 		 * implicitly unstage the file.
8428 		 */
8429 		if (memcmp(ie->staged_blob_sha1, ie->blob_sha1,
8430 		    sizeof(ie->blob_sha1)) == 0) {
8431 			got_fileindex_entry_stage_set(ie,
8432 			    GOT_FILEIDX_STAGE_NONE);
8433 		}
8434 		break;
8435 	case GOT_STATUS_DELETE:
8436 		if (staged_status == GOT_STATUS_DELETE)
8437 			break;
8438 		if (a->patch_cb) {
8439 			int choice = GOT_PATCH_CHOICE_NONE;
8440 			err = (*a->patch_cb)(&choice, a->patch_arg, status,
8441 			    ie->path, NULL, 1, 1);
8442 			if (err)
8443 				break;
8444 			if (choice == GOT_PATCH_CHOICE_NO)
8445 				break;
8446 			if (choice != GOT_PATCH_CHOICE_YES) {
8447 				err = got_error(GOT_ERR_PATCH_CHOICE);
8448 				break;
8449 			}
8450 		}
8451 		stage = GOT_FILEIDX_STAGE_DELETE;
8452 		got_fileindex_entry_stage_set(ie, stage);
8453 		a->staged_something = 1;
8454 		if (a->status_cb == NULL)
8455 			break;
8456 		err = (*a->status_cb)(a->status_arg, GOT_STATUS_NO_CHANGE,
8457 		    get_staged_status(ie), relpath, NULL, NULL, NULL, dirfd,
8458 		    de_name);
8459 		break;
8460 	case GOT_STATUS_NO_CHANGE:
8461 		break;
8462 	case GOT_STATUS_CONFLICT:
8463 		err = got_error_path(relpath, GOT_ERR_STAGE_CONFLICT);
8464 		break;
8465 	case GOT_STATUS_NONEXISTENT:
8466 		err = got_error_set_errno(ENOENT, relpath);
8467 		break;
8468 	default:
8469 		err = got_error_path(relpath, GOT_ERR_FILE_STATUS);
8470 		break;
8471 	}
8472 
8473 	if (path_content && unlink(path_content) == -1 && err == NULL)
8474 		err = got_error_from_errno2("unlink", path_content);
8475 	free(path_content);
8476 	free(ondisk_path);
8477 	free(new_staged_blob_id);
8478 	return err;
8479 }
8480 
8481 const struct got_error *
8482 got_worktree_stage(struct got_worktree *worktree,
8483     struct got_pathlist_head *paths,
8484     got_worktree_status_cb status_cb, void *status_arg,
8485     got_worktree_patch_cb patch_cb, void *patch_arg,
8486     int allow_bad_symlinks, struct got_repository *repo)
8487 {
8488 	const struct got_error *err = NULL, *sync_err, *unlockerr;
8489 	struct got_pathlist_entry *pe;
8490 	struct got_fileindex *fileindex = NULL;
8491 	char *fileindex_path = NULL;
8492 	struct got_reference *head_ref = NULL;
8493 	struct got_object_id *head_commit_id = NULL;
8494 	struct check_stage_ok_arg oka;
8495 	struct stage_path_arg spa;
8496 
8497 	err = lock_worktree(worktree, LOCK_EX);
8498 	if (err)
8499 		return err;
8500 
8501 	err = got_ref_open(&head_ref, repo,
8502 	    got_worktree_get_head_ref_name(worktree), 0);
8503 	if (err)
8504 		goto done;
8505 	err = got_ref_resolve(&head_commit_id, repo, head_ref);
8506 	if (err)
8507 		goto done;
8508 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
8509 	if (err)
8510 		goto done;
8511 
8512 	/* Check pre-conditions before staging anything. */
8513 	oka.head_commit_id = head_commit_id;
8514 	oka.worktree = worktree;
8515 	oka.fileindex = fileindex;
8516 	oka.repo = repo;
8517 	oka.have_changes = 0;
8518 	TAILQ_FOREACH(pe, paths, entry) {
8519 		err = worktree_status(worktree, pe->path, fileindex, repo,
8520 		    check_stage_ok, &oka, NULL, NULL, 1, 0);
8521 		if (err)
8522 			goto done;
8523 	}
8524 	if (!oka.have_changes) {
8525 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8526 		goto done;
8527 	}
8528 
8529 	spa.worktree = worktree;
8530 	spa.fileindex = fileindex;
8531 	spa.repo = repo;
8532 	spa.patch_cb = patch_cb;
8533 	spa.patch_arg = patch_arg;
8534 	spa.status_cb = status_cb;
8535 	spa.status_arg = status_arg;
8536 	spa.staged_something = 0;
8537 	spa.allow_bad_symlinks = allow_bad_symlinks;
8538 	TAILQ_FOREACH(pe, paths, entry) {
8539 		err = worktree_status(worktree, pe->path, fileindex, repo,
8540 		    stage_path, &spa, NULL, NULL, 1, 0);
8541 		if (err)
8542 			goto done;
8543 	}
8544 	if (!spa.staged_something) {
8545 		err = got_error(GOT_ERR_STAGE_NO_CHANGE);
8546 		goto done;
8547 	}
8548 
8549 	sync_err = sync_fileindex(fileindex, fileindex_path);
8550 	if (sync_err && err == NULL)
8551 		err = sync_err;
8552 done:
8553 	if (head_ref)
8554 		got_ref_close(head_ref);
8555 	free(head_commit_id);
8556 	free(fileindex_path);
8557 	if (fileindex)
8558 		got_fileindex_free(fileindex);
8559 	unlockerr = lock_worktree(worktree, LOCK_SH);
8560 	if (unlockerr && err == NULL)
8561 		err = unlockerr;
8562 	return err;
8563 }
8564 
8565 struct unstage_path_arg {
8566 	struct got_worktree *worktree;
8567 	struct got_fileindex *fileindex;
8568 	struct got_repository *repo;
8569 	got_worktree_checkout_cb progress_cb;
8570 	void *progress_arg;
8571 	got_worktree_patch_cb patch_cb;
8572 	void *patch_arg;
8573 };
8574 
8575 static const struct got_error *
8576 create_unstaged_content(char **path_unstaged_content,
8577     char **path_new_staged_content, struct got_object_id *blob_id,
8578     struct got_object_id *staged_blob_id, const char *relpath,
8579     struct got_repository *repo,
8580     got_worktree_patch_cb patch_cb, void *patch_arg)
8581 {
8582 	const struct got_error *err, *free_err;
8583 	struct got_blob_object *blob = NULL, *staged_blob = NULL;
8584 	FILE *f1 = NULL, *f2 = NULL, *outfile = NULL, *rejectfile = NULL;
8585 	char *path1 = NULL, *path2 = NULL, *label1 = NULL;
8586 	struct got_diffreg_result *diffreg_result = NULL;
8587 	int line_cur1 = 1, line_cur2 = 1, n = 0, nchunks_used = 0;
8588 	int have_content = 0, have_rejected_content = 0, i = 0, nchanges = 0;
8589 	int fd1 = -1, fd2 = -1;
8590 
8591 	*path_unstaged_content = NULL;
8592 	*path_new_staged_content = NULL;
8593 
8594 	err = got_object_id_str(&label1, blob_id);
8595 	if (err)
8596 		return err;
8597 
8598 	fd1 = got_opentempfd();
8599 	if (fd1 == -1) {
8600 		err = got_error_from_errno("got_opentempfd");
8601 		goto done;
8602 	}
8603 	fd2 = got_opentempfd();
8604 	if (fd2 == -1) {
8605 		err = got_error_from_errno("got_opentempfd");
8606 		goto done;
8607 	}
8608 
8609 	err = got_object_open_as_blob(&blob, repo, blob_id, 8192, fd1);
8610 	if (err)
8611 		goto done;
8612 
8613 	err = got_opentemp_named(&path1, &f1, "got-unstage-blob-base", "");
8614 	if (err)
8615 		goto done;
8616 
8617 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f1, blob);
8618 	if (err)
8619 		goto done;
8620 
8621 	err = got_object_open_as_blob(&staged_blob, repo, staged_blob_id, 8192,
8622 	    fd2);
8623 	if (err)
8624 		goto done;
8625 
8626 	err = got_opentemp_named(&path2, &f2, "got-unstage-blob-staged", "");
8627 	if (err)
8628 		goto done;
8629 
8630 	err = got_object_blob_dump_to_file(NULL, NULL, NULL, f2, staged_blob);
8631 	if (err)
8632 		goto done;
8633 
8634 	err = got_diff_files(&diffreg_result, f1, 1, label1, f2, 1,
8635 	    path2, 3, 0, 1, NULL, GOT_DIFF_ALGORITHM_MYERS);
8636 	if (err)
8637 		goto done;
8638 
8639 	err = got_opentemp_named(path_unstaged_content, &outfile,
8640 	    "got-unstaged-content", "");
8641 	if (err)
8642 		goto done;
8643 	err = got_opentemp_named(path_new_staged_content, &rejectfile,
8644 	    "got-new-staged-content", "");
8645 	if (err)
8646 		goto done;
8647 
8648 	if (fseek(f1, 0L, SEEK_SET) == -1) {
8649 		err = got_ferror(f1, GOT_ERR_IO);
8650 		goto done;
8651 	}
8652 	if (fseek(f2, 0L, SEEK_SET) == -1) {
8653 		err = got_ferror(f2, GOT_ERR_IO);
8654 		goto done;
8655 	}
8656 	/* Count the number of actual changes in the diff result. */
8657 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8658 		struct diff_chunk_context cc = {};
8659 		diff_chunk_context_load_change(&cc, &nchunks_used,
8660 		    diffreg_result->result, n, 0);
8661 		nchanges++;
8662 	}
8663 	for (n = 0; n < diffreg_result->result->chunks.len; n += nchunks_used) {
8664 		int choice;
8665 		err = apply_or_reject_change(&choice, &nchunks_used,
8666 		    diffreg_result->result, n, relpath, f1, f2,
8667 		    &line_cur1, &line_cur2,
8668 		    outfile, rejectfile, ++i, nchanges, patch_cb, patch_arg);
8669 		if (err)
8670 			goto done;
8671 		if (choice == GOT_PATCH_CHOICE_YES)
8672 			have_content = 1;
8673 		else
8674 			have_rejected_content = 1;
8675 		if (choice == GOT_PATCH_CHOICE_QUIT)
8676 			break;
8677 	}
8678 	if (have_content || have_rejected_content)
8679 		err = copy_remaining_content(f1, f2, &line_cur1, &line_cur2,
8680 		    outfile, rejectfile);
8681 done:
8682 	free(label1);
8683 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
8684 		err = got_error_from_errno("close");
8685 	if (blob)
8686 		got_object_blob_close(blob);
8687 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
8688 		err = got_error_from_errno("close");
8689 	if (staged_blob)
8690 		got_object_blob_close(staged_blob);
8691 	free_err = got_diffreg_result_free(diffreg_result);
8692 	if (free_err && err == NULL)
8693 		err = free_err;
8694 	if (f1 && fclose(f1) == EOF && err == NULL)
8695 		err = got_error_from_errno2("fclose", path1);
8696 	if (f2 && fclose(f2) == EOF && err == NULL)
8697 		err = got_error_from_errno2("fclose", path2);
8698 	if (outfile && fclose(outfile) == EOF && err == NULL)
8699 		err = got_error_from_errno2("fclose", *path_unstaged_content);
8700 	if (rejectfile && fclose(rejectfile) == EOF && err == NULL)
8701 		err = got_error_from_errno2("fclose", *path_new_staged_content);
8702 	if (path1 && unlink(path1) == -1 && err == NULL)
8703 		err = got_error_from_errno2("unlink", path1);
8704 	if (path2 && unlink(path2) == -1 && err == NULL)
8705 		err = got_error_from_errno2("unlink", path2);
8706 	if (err || !have_content) {
8707 		if (*path_unstaged_content &&
8708 		    unlink(*path_unstaged_content) == -1 && err == NULL)
8709 			err = got_error_from_errno2("unlink",
8710 			    *path_unstaged_content);
8711 		free(*path_unstaged_content);
8712 		*path_unstaged_content = NULL;
8713 	}
8714 	if (err || !have_content || !have_rejected_content) {
8715 		if (*path_new_staged_content &&
8716 		    unlink(*path_new_staged_content) == -1 && err == NULL)
8717 			err = got_error_from_errno2("unlink",
8718 			    *path_new_staged_content);
8719 		free(*path_new_staged_content);
8720 		*path_new_staged_content = NULL;
8721 	}
8722 	free(path1);
8723 	free(path2);
8724 	return err;
8725 }
8726 
8727 static const struct got_error *
8728 unstage_hunks(struct got_object_id *staged_blob_id,
8729     struct got_blob_object *blob_base,
8730     struct got_object_id *blob_id, struct got_fileindex_entry *ie,
8731     const char *ondisk_path, const char *label_orig,
8732     struct got_worktree *worktree, struct got_repository *repo,
8733     got_worktree_patch_cb patch_cb, void *patch_arg,
8734     got_worktree_checkout_cb progress_cb, void *progress_arg)
8735 {
8736 	const struct got_error *err = NULL;
8737 	char *path_unstaged_content = NULL;
8738 	char *path_new_staged_content = NULL;
8739 	char *parent = NULL, *base_path = NULL;
8740 	char *blob_base_path = NULL;
8741 	struct got_object_id *new_staged_blob_id = NULL;
8742 	FILE *f = NULL, *f_base = NULL, *f_deriv2 = NULL;
8743 	struct stat sb;
8744 
8745 	err = create_unstaged_content(&path_unstaged_content,
8746 	    &path_new_staged_content, blob_id, staged_blob_id,
8747 	    ie->path, repo, patch_cb, patch_arg);
8748 	if (err)
8749 		return err;
8750 
8751 	if (path_unstaged_content == NULL)
8752 		return NULL;
8753 
8754 	if (path_new_staged_content) {
8755 		err = got_object_blob_create(&new_staged_blob_id,
8756 		    path_new_staged_content, repo);
8757 		if (err)
8758 			goto done;
8759 	}
8760 
8761 	f = fopen(path_unstaged_content, "re");
8762 	if (f == NULL) {
8763 		err = got_error_from_errno2("fopen",
8764 		    path_unstaged_content);
8765 		goto done;
8766 	}
8767 	if (fstat(fileno(f), &sb) == -1) {
8768 		err = got_error_from_errno2("fstat", path_unstaged_content);
8769 		goto done;
8770 	}
8771 	if (got_fileindex_entry_staged_filetype_get(ie) ==
8772 	    GOT_FILEIDX_MODE_SYMLINK && sb.st_size < PATH_MAX) {
8773 		char link_target[PATH_MAX];
8774 		size_t r;
8775 		r = fread(link_target, 1, sizeof(link_target), f);
8776 		if (r == 0 && ferror(f)) {
8777 			err = got_error_from_errno("fread");
8778 			goto done;
8779 		}
8780 		if (r >= sizeof(link_target)) { /* should not happen */
8781 			err = got_error(GOT_ERR_NO_SPACE);
8782 			goto done;
8783 		}
8784 		link_target[r] = '\0';
8785 		err = merge_symlink(worktree, blob_base,
8786 		    ondisk_path, ie->path, label_orig, link_target,
8787 		    worktree->base_commit_id, repo, progress_cb,
8788 		    progress_arg);
8789 	} else {
8790 		int local_changes_subsumed;
8791 
8792 		err = got_path_dirname(&parent, ondisk_path);
8793 		if (err)
8794 			return err;
8795 
8796 		if (asprintf(&base_path, "%s/got-unstage-blob-orig",
8797 		    parent) == -1) {
8798 			err = got_error_from_errno("asprintf");
8799 			base_path = NULL;
8800 			goto done;
8801 		}
8802 
8803 		err = got_opentemp_named(&blob_base_path, &f_base,
8804 		    base_path, "");
8805 		if (err)
8806 			goto done;
8807 		err = got_object_blob_dump_to_file(NULL, NULL, NULL, f_base,
8808 		    blob_base);
8809 		if (err)
8810 			goto done;
8811 
8812 		/*
8813 		 * In order the run a 3-way merge with a symlink we copy the symlink's
8814 		 * target path into a temporary file and use that file with diff3.
8815 		 */
8816 		if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8817 			err = dump_symlink_target_path_to_file(&f_deriv2,
8818 			    ondisk_path);
8819 			if (err)
8820 				goto done;
8821 		} else {
8822 			int fd;
8823 			fd = open(ondisk_path,
8824 			    O_RDONLY | O_NOFOLLOW | O_CLOEXEC);
8825 			if (fd == -1) {
8826 				err = got_error_from_errno2("open", ondisk_path);
8827 				goto done;
8828 			}
8829 			f_deriv2 = fdopen(fd, "r");
8830 			if (f_deriv2 == NULL) {
8831 				err = got_error_from_errno2("fdopen", ondisk_path);
8832 				close(fd);
8833 				goto done;
8834 			}
8835 		}
8836 
8837 		err = merge_file(&local_changes_subsumed, worktree,
8838 		    f_base, f, f_deriv2, ondisk_path, ie->path,
8839 		    got_fileindex_perms_to_st(ie),
8840 		    label_orig, "unstaged", NULL, GOT_DIFF_ALGORITHM_MYERS,
8841 		    repo, progress_cb, progress_arg);
8842 	}
8843 	if (err)
8844 		goto done;
8845 
8846 	if (new_staged_blob_id) {
8847 		memcpy(ie->staged_blob_sha1, new_staged_blob_id->sha1,
8848 		    SHA1_DIGEST_LENGTH);
8849 	} else {
8850 		got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
8851 		got_fileindex_entry_staged_filetype_set(ie, 0);
8852 	}
8853 done:
8854 	free(new_staged_blob_id);
8855 	if (path_unstaged_content &&
8856 	    unlink(path_unstaged_content) == -1 && err == NULL)
8857 		err = got_error_from_errno2("unlink", path_unstaged_content);
8858 	if (path_new_staged_content &&
8859 	    unlink(path_new_staged_content) == -1 && err == NULL)
8860 		err = got_error_from_errno2("unlink", path_new_staged_content);
8861 	if (blob_base_path && unlink(blob_base_path) == -1 && err == NULL)
8862 		err = got_error_from_errno2("unlink", blob_base_path);
8863 	if (f_base && fclose(f_base) == EOF && err == NULL)
8864 		err = got_error_from_errno2("fclose", path_unstaged_content);
8865 	if (f && fclose(f) == EOF && err == NULL)
8866 		err = got_error_from_errno2("fclose", path_unstaged_content);
8867 	if (f_deriv2 && fclose(f_deriv2) == EOF && err == NULL)
8868 		err = got_error_from_errno2("fclose", ondisk_path);
8869 	free(path_unstaged_content);
8870 	free(path_new_staged_content);
8871 	free(blob_base_path);
8872 	free(parent);
8873 	free(base_path);
8874 	return err;
8875 }
8876 
8877 static const struct got_error *
8878 unstage_path(void *arg, unsigned char status,
8879     unsigned char staged_status, const char *relpath,
8880     struct got_object_id *blob_id, struct got_object_id *staged_blob_id,
8881     struct got_object_id *commit_id, int dirfd, const char *de_name)
8882 {
8883 	const struct got_error *err = NULL;
8884 	struct unstage_path_arg *a = arg;
8885 	struct got_fileindex_entry *ie;
8886 	struct got_blob_object *blob_base = NULL, *blob_staged = NULL;
8887 	char *ondisk_path = NULL;
8888 	char *id_str = NULL, *label_orig = NULL;
8889 	int local_changes_subsumed;
8890 	struct stat sb;
8891 	int fd1 = -1, fd2 = -1;
8892 
8893 	if (staged_status != GOT_STATUS_ADD &&
8894 	    staged_status != GOT_STATUS_MODIFY &&
8895 	    staged_status != GOT_STATUS_DELETE)
8896 		return NULL;
8897 
8898 	ie = got_fileindex_entry_get(a->fileindex, relpath, strlen(relpath));
8899 	if (ie == NULL)
8900 		return got_error_path(relpath, GOT_ERR_FILE_STATUS);
8901 
8902 	if (asprintf(&ondisk_path, "%s/%s", a->worktree->root_path, relpath)
8903 	    == -1)
8904 		return got_error_from_errno("asprintf");
8905 
8906 	err = got_object_id_str(&id_str,
8907 	    commit_id ? commit_id : a->worktree->base_commit_id);
8908 	if (err)
8909 		goto done;
8910 	if (asprintf(&label_orig, "%s: commit %s", GOT_MERGE_LABEL_BASE,
8911 	    id_str) == -1) {
8912 		err = got_error_from_errno("asprintf");
8913 		goto done;
8914 	}
8915 
8916 	fd1 = got_opentempfd();
8917 	if (fd1 == -1) {
8918 		err = got_error_from_errno("got_opentempfd");
8919 		goto done;
8920 	}
8921 	fd2 = got_opentempfd();
8922 	if (fd2 == -1) {
8923 		err = got_error_from_errno("got_opentempfd");
8924 		goto done;
8925 	}
8926 
8927 	switch (staged_status) {
8928 	case GOT_STATUS_MODIFY:
8929 		err = got_object_open_as_blob(&blob_base, a->repo,
8930 		    blob_id, 8192, fd1);
8931 		if (err)
8932 			break;
8933 		/* fall through */
8934 	case GOT_STATUS_ADD:
8935 		if (a->patch_cb) {
8936 			if (staged_status == GOT_STATUS_ADD) {
8937 				int choice = GOT_PATCH_CHOICE_NONE;
8938 				err = (*a->patch_cb)(&choice, a->patch_arg,
8939 				    staged_status, ie->path, NULL, 1, 1);
8940 				if (err)
8941 					break;
8942 				if (choice != GOT_PATCH_CHOICE_YES)
8943 					break;
8944 			} else {
8945 				err = unstage_hunks(staged_blob_id,
8946 				    blob_base, blob_id, ie, ondisk_path,
8947 				    label_orig, a->worktree, a->repo,
8948 				    a->patch_cb, a->patch_arg,
8949 				    a->progress_cb, a->progress_arg);
8950 				break; /* Done with this file. */
8951 			}
8952 		}
8953 		err = got_object_open_as_blob(&blob_staged, a->repo,
8954 		    staged_blob_id, 8192, fd2);
8955 		if (err)
8956 			break;
8957 		switch (got_fileindex_entry_staged_filetype_get(ie)) {
8958 		case GOT_FILEIDX_MODE_BAD_SYMLINK:
8959 		case GOT_FILEIDX_MODE_REGULAR_FILE:
8960 			err = merge_blob(&local_changes_subsumed, a->worktree,
8961 			    blob_base, ondisk_path, relpath,
8962 			    got_fileindex_perms_to_st(ie), label_orig,
8963 			    blob_staged, commit_id ? commit_id :
8964 			    a->worktree->base_commit_id, a->repo,
8965 			    a->progress_cb, a->progress_arg);
8966 			break;
8967 		case GOT_FILEIDX_MODE_SYMLINK:
8968 			if (S_ISLNK(got_fileindex_perms_to_st(ie))) {
8969 				char *staged_target;
8970 				err = got_object_blob_read_to_str(
8971 				    &staged_target, blob_staged);
8972 				if (err)
8973 					goto done;
8974 				err = merge_symlink(a->worktree, blob_base,
8975 				    ondisk_path, relpath, label_orig,
8976 				    staged_target, commit_id ? commit_id :
8977 				    a->worktree->base_commit_id,
8978 				    a->repo, a->progress_cb, a->progress_arg);
8979 				free(staged_target);
8980 			} else {
8981 				err = merge_blob(&local_changes_subsumed,
8982 				    a->worktree, blob_base, ondisk_path,
8983 				    relpath, got_fileindex_perms_to_st(ie),
8984 				    label_orig, blob_staged,
8985 				    commit_id ? commit_id :
8986 				    a->worktree->base_commit_id, a->repo,
8987 				    a->progress_cb, a->progress_arg);
8988 			}
8989 			break;
8990 		default:
8991 			err = got_error_path(relpath, GOT_ERR_BAD_FILETYPE);
8992 			break;
8993 		}
8994 		if (err == NULL) {
8995 			got_fileindex_entry_stage_set(ie,
8996 			    GOT_FILEIDX_STAGE_NONE);
8997 			got_fileindex_entry_staged_filetype_set(ie, 0);
8998 		}
8999 		break;
9000 	case GOT_STATUS_DELETE:
9001 		if (a->patch_cb) {
9002 			int choice = GOT_PATCH_CHOICE_NONE;
9003 			err = (*a->patch_cb)(&choice, a->patch_arg,
9004 			    staged_status, ie->path, NULL, 1, 1);
9005 			if (err)
9006 				break;
9007 			if (choice == GOT_PATCH_CHOICE_NO)
9008 				break;
9009 			if (choice != GOT_PATCH_CHOICE_YES) {
9010 				err = got_error(GOT_ERR_PATCH_CHOICE);
9011 				break;
9012 			}
9013 		}
9014 		got_fileindex_entry_stage_set(ie, GOT_FILEIDX_STAGE_NONE);
9015 		got_fileindex_entry_staged_filetype_set(ie, 0);
9016 		err = get_file_status(&status, &sb, ie, ondisk_path,
9017 		    dirfd, de_name, a->repo);
9018 		if (err)
9019 			break;
9020 		err = (*a->progress_cb)(a->progress_arg, status, relpath);
9021 		break;
9022 	}
9023 done:
9024 	free(ondisk_path);
9025 	if (fd1 != -1 && close(fd1) == -1 && err == NULL)
9026 		err = got_error_from_errno("close");
9027 	if (blob_base)
9028 		got_object_blob_close(blob_base);
9029 	if (fd2 != -1 && close(fd2) == -1 && err == NULL)
9030 		err = got_error_from_errno("close");
9031 	if (blob_staged)
9032 		got_object_blob_close(blob_staged);
9033 	free(id_str);
9034 	free(label_orig);
9035 	return err;
9036 }
9037 
9038 const struct got_error *
9039 got_worktree_unstage(struct got_worktree *worktree,
9040     struct got_pathlist_head *paths,
9041     got_worktree_checkout_cb progress_cb, void *progress_arg,
9042     got_worktree_patch_cb patch_cb, void *patch_arg,
9043     struct got_repository *repo)
9044 {
9045 	const struct got_error *err = NULL, *sync_err, *unlockerr;
9046 	struct got_pathlist_entry *pe;
9047 	struct got_fileindex *fileindex = NULL;
9048 	char *fileindex_path = NULL;
9049 	struct unstage_path_arg upa;
9050 
9051 	err = lock_worktree(worktree, LOCK_EX);
9052 	if (err)
9053 		return err;
9054 
9055 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
9056 	if (err)
9057 		goto done;
9058 
9059 	upa.worktree = worktree;
9060 	upa.fileindex = fileindex;
9061 	upa.repo = repo;
9062 	upa.progress_cb = progress_cb;
9063 	upa.progress_arg = progress_arg;
9064 	upa.patch_cb = patch_cb;
9065 	upa.patch_arg = patch_arg;
9066 	TAILQ_FOREACH(pe, paths, entry) {
9067 		err = worktree_status(worktree, pe->path, fileindex, repo,
9068 		    unstage_path, &upa, NULL, NULL, 1, 0);
9069 		if (err)
9070 			goto done;
9071 	}
9072 
9073 	sync_err = sync_fileindex(fileindex, fileindex_path);
9074 	if (sync_err && err == NULL)
9075 		err = sync_err;
9076 done:
9077 	free(fileindex_path);
9078 	if (fileindex)
9079 		got_fileindex_free(fileindex);
9080 	unlockerr = lock_worktree(worktree, LOCK_SH);
9081 	if (unlockerr && err == NULL)
9082 		err = unlockerr;
9083 	return err;
9084 }
9085 
9086 struct report_file_info_arg {
9087 	struct got_worktree *worktree;
9088 	got_worktree_path_info_cb info_cb;
9089 	void *info_arg;
9090 	struct got_pathlist_head *paths;
9091 	got_cancel_cb cancel_cb;
9092 	void *cancel_arg;
9093 };
9094 
9095 static const struct got_error *
9096 report_file_info(void *arg, struct got_fileindex_entry *ie)
9097 {
9098 	struct report_file_info_arg *a = arg;
9099 	struct got_pathlist_entry *pe;
9100 	struct got_object_id blob_id, staged_blob_id, commit_id;
9101 	struct got_object_id *blob_idp = NULL, *staged_blob_idp = NULL;
9102 	struct got_object_id *commit_idp = NULL;
9103 	int stage;
9104 
9105 	if (a->cancel_cb && a->cancel_cb(a->cancel_arg))
9106 		return got_error(GOT_ERR_CANCELLED);
9107 
9108 	TAILQ_FOREACH(pe, a->paths, entry) {
9109 		if (pe->path_len == 0 || strcmp(pe->path, ie->path) == 0 ||
9110 		    got_path_is_child(ie->path, pe->path, pe->path_len))
9111 			break;
9112 	}
9113 	if (pe == NULL) /* not found */
9114 		return NULL;
9115 
9116 	if (got_fileindex_entry_has_blob(ie)) {
9117 		memcpy(blob_id.sha1, ie->blob_sha1, SHA1_DIGEST_LENGTH);
9118 		blob_idp = &blob_id;
9119 	}
9120 	stage = got_fileindex_entry_stage_get(ie);
9121 	if (stage == GOT_FILEIDX_STAGE_MODIFY ||
9122 	    stage == GOT_FILEIDX_STAGE_ADD) {
9123 		memcpy(staged_blob_id.sha1, ie->staged_blob_sha1,
9124 		    SHA1_DIGEST_LENGTH);
9125 		staged_blob_idp = &staged_blob_id;
9126 	}
9127 
9128 	if (got_fileindex_entry_has_commit(ie)) {
9129 		memcpy(commit_id.sha1, ie->commit_sha1, SHA1_DIGEST_LENGTH);
9130 		commit_idp = &commit_id;
9131 	}
9132 
9133 	return a->info_cb(a->info_arg, ie->path, got_fileindex_perms_to_st(ie),
9134 	    (time_t)ie->mtime_sec, blob_idp, staged_blob_idp, commit_idp);
9135 }
9136 
9137 const struct got_error *
9138 got_worktree_path_info(struct got_worktree *worktree,
9139     struct got_pathlist_head *paths,
9140     got_worktree_path_info_cb info_cb, void *info_arg,
9141     got_cancel_cb cancel_cb, void *cancel_arg)
9142 
9143 {
9144 	const struct got_error *err = NULL, *unlockerr;
9145 	struct got_fileindex *fileindex = NULL;
9146 	char *fileindex_path = NULL;
9147 	struct report_file_info_arg arg;
9148 
9149 	err = lock_worktree(worktree, LOCK_SH);
9150 	if (err)
9151 		return err;
9152 
9153 	err = open_fileindex(&fileindex, &fileindex_path, worktree);
9154 	if (err)
9155 		goto done;
9156 
9157 	arg.worktree = worktree;
9158 	arg.info_cb = info_cb;
9159 	arg.info_arg = info_arg;
9160 	arg.paths = paths;
9161 	arg.cancel_cb = cancel_cb;
9162 	arg.cancel_arg = cancel_arg;
9163 	err = got_fileindex_for_each_entry_safe(fileindex, report_file_info,
9164 	    &arg);
9165 done:
9166 	free(fileindex_path);
9167 	if (fileindex)
9168 		got_fileindex_free(fileindex);
9169 	unlockerr = lock_worktree(worktree, LOCK_UN);
9170 	if (unlockerr && err == NULL)
9171 		err = unlockerr;
9172 	return err;
9173 }
9174 
9175 static const struct got_error *
9176 patch_check_path(const char *p, char **path, unsigned char *status,
9177     unsigned char *staged_status, struct got_fileindex *fileindex,
9178     struct got_worktree *worktree, struct got_repository *repo)
9179 {
9180 	const struct got_error *err;
9181 	struct got_fileindex_entry *ie;
9182 	struct stat sb;
9183 	char *ondisk_path = NULL;
9184 
9185 	err = got_worktree_resolve_path(path, worktree, p);
9186 	if (err)
9187 		return err;
9188 
9189 	if (asprintf(&ondisk_path, "%s%s%s", worktree->root_path,
9190 	    *path[0] ? "/" : "", *path) == -1)
9191 		return got_error_from_errno("asprintf");
9192 
9193 	ie = got_fileindex_entry_get(fileindex, *path, strlen(*path));
9194 	if (ie) {
9195 		*staged_status = get_staged_status(ie);
9196 		err = get_file_status(status, &sb, ie, ondisk_path, -1, NULL,
9197 		    repo);
9198 		if (err)
9199 			goto done;
9200 	} else {
9201 		*staged_status = GOT_STATUS_NO_CHANGE;
9202 		*status = GOT_STATUS_UNVERSIONED;
9203 		if (lstat(ondisk_path, &sb) == -1) {
9204 			if (errno != ENOENT) {
9205 				err = got_error_from_errno2("lstat",
9206 				    ondisk_path);
9207 				goto done;
9208 			}
9209 			*status = GOT_STATUS_NONEXISTENT;
9210 		}
9211 	}
9212 
9213 done:
9214 	free(ondisk_path);
9215 	return err;
9216 }
9217 
9218 static const struct got_error *
9219 patch_can_rm(const char *path, unsigned char status,
9220     unsigned char staged_status)
9221 {
9222 	if (status == GOT_STATUS_NONEXISTENT)
9223 		return got_error_set_errno(ENOENT, path);
9224 	if (status != GOT_STATUS_NO_CHANGE &&
9225 	    status != GOT_STATUS_ADD &&
9226 	    status != GOT_STATUS_MODIFY &&
9227 	    status != GOT_STATUS_MODE_CHANGE)
9228 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9229 	if (staged_status == GOT_STATUS_DELETE)
9230 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9231 	return NULL;
9232 }
9233 
9234 static const struct got_error *
9235 patch_can_add(const char *path, unsigned char status)
9236 {
9237 	if (status != GOT_STATUS_NONEXISTENT)
9238 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9239 	return NULL;
9240 }
9241 
9242 static const struct got_error *
9243 patch_can_edit(const char *path, unsigned char status,
9244     unsigned char staged_status)
9245 {
9246 	if (status == GOT_STATUS_NONEXISTENT)
9247 		return got_error_set_errno(ENOENT, path);
9248 	if (status != GOT_STATUS_NO_CHANGE &&
9249 	    status != GOT_STATUS_ADD &&
9250 	    status != GOT_STATUS_MODIFY)
9251 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9252 	if (staged_status == GOT_STATUS_DELETE)
9253 		return got_error_path(path, GOT_ERR_FILE_STATUS);
9254 	return NULL;
9255 }
9256 
9257 const struct got_error *
9258 got_worktree_patch_prepare(struct got_fileindex **fileindex,
9259     char **fileindex_path, struct got_worktree *worktree)
9260 {
9261 	return open_fileindex(fileindex, fileindex_path, worktree);
9262 }
9263 
9264 const struct got_error *
9265 got_worktree_patch_check_path(const char *old, const char *new,
9266     char **oldpath, char **newpath, struct got_worktree *worktree,
9267     struct got_repository *repo, struct got_fileindex *fileindex)
9268 {
9269 	const struct got_error *err = NULL;
9270 	int file_renamed = 0;
9271 	unsigned char status_old, staged_status_old;
9272 	unsigned char status_new, staged_status_new;
9273 
9274 	*oldpath = NULL;
9275 	*newpath = NULL;
9276 
9277 	err = patch_check_path(old != NULL ? old : new, oldpath,
9278 	    &status_old, &staged_status_old, fileindex, worktree, repo);
9279 	if (err)
9280 		goto done;
9281 
9282 	err = patch_check_path(new != NULL ? new : old, newpath,
9283 	    &status_new, &staged_status_new, fileindex, worktree, repo);
9284 	if (err)
9285 		goto done;
9286 
9287 	if (old != NULL && new != NULL && strcmp(old, new) != 0)
9288 		file_renamed = 1;
9289 
9290 	if (old != NULL && new == NULL)
9291 		err = patch_can_rm(*oldpath, status_old, staged_status_old);
9292 	else if (file_renamed) {
9293 		err = patch_can_rm(*oldpath, status_old, staged_status_old);
9294 		if (err == NULL)
9295 			err = patch_can_add(*newpath, status_new);
9296 	} else if (old == NULL)
9297 		err = patch_can_add(*newpath, status_new);
9298 	else
9299 		err = patch_can_edit(*newpath, status_new, staged_status_new);
9300 
9301 done:
9302 	if (err) {
9303 		free(*oldpath);
9304 		*oldpath = NULL;
9305 		free(*newpath);
9306 		*newpath = NULL;
9307 	}
9308 	return err;
9309 }
9310 
9311 const struct got_error *
9312 got_worktree_patch_schedule_add(const char *path, struct got_repository *repo,
9313     struct got_worktree *worktree, struct got_fileindex *fileindex,
9314     got_worktree_checkout_cb progress_cb, void *progress_arg)
9315 {
9316 	struct schedule_addition_args saa;
9317 
9318 	memset(&saa, 0, sizeof(saa));
9319 	saa.worktree = worktree;
9320 	saa.fileindex = fileindex;
9321 	saa.progress_cb = progress_cb;
9322 	saa.progress_arg = progress_arg;
9323 	saa.repo = repo;
9324 
9325 	return worktree_status(worktree, path, fileindex, repo,
9326 	    schedule_addition, &saa, NULL, NULL, 1, 0);
9327 }
9328 
9329 const struct got_error *
9330 got_worktree_patch_schedule_rm(const char *path, struct got_repository *repo,
9331     struct got_worktree *worktree, struct got_fileindex *fileindex,
9332     got_worktree_delete_cb progress_cb, void *progress_arg)
9333 {
9334 	struct schedule_deletion_args sda;
9335 
9336 	memset(&sda, 0, sizeof(sda));
9337 	sda.worktree = worktree;
9338 	sda.fileindex = fileindex;
9339 	sda.progress_cb = progress_cb;
9340 	sda.progress_arg = progress_arg;
9341 	sda.repo = repo;
9342 	sda.delete_local_mods = 0;
9343 	sda.keep_on_disk = 0;
9344 	sda.ignore_missing_paths = 0;
9345 	sda.status_codes = NULL;
9346 
9347 	return worktree_status(worktree, path, fileindex, repo,
9348 	    schedule_for_deletion, &sda, NULL, NULL, 1, 1);
9349 }
9350 
9351 const struct got_error *
9352 got_worktree_patch_complete(struct got_fileindex *fileindex,
9353     const char *fileindex_path)
9354 {
9355 	const struct got_error *err = NULL;
9356 
9357 	err = sync_fileindex(fileindex, fileindex_path);
9358 	got_fileindex_free(fileindex);
9359 
9360 	return err;
9361 }