2 #include "argv-array.h"
3 #include "repository.h"
8 #include "cache-tree.h"
9 #include "unpack-trees.h"
13 #include "split-index.h"
15 #include "submodule.h"
16 #include "submodule-config.h"
17 #include "fsmonitor.h"
18 #include "object-store.h"
19 #include "fetch-object.h"
22 * Error messages expected by scripts out of plumbing commands such as
23 * read-tree. Non-scripted Porcelain is not required to use these messages
24 * and in fact are encouraged to reword them to better suit their particular
25 * situation better. See how "git checkout" and "git merge" replaces
26 * them using setup_unpack_trees_porcelain(), for example.
28 static const char *unpack_plumbing_errors
[NB_UNPACK_TREES_ERROR_TYPES
] = {
29 /* ERROR_WOULD_OVERWRITE */
30 "Entry '%s' would be overwritten by merge. Cannot merge.",
32 /* ERROR_NOT_UPTODATE_FILE */
33 "Entry '%s' not uptodate. Cannot merge.",
35 /* ERROR_NOT_UPTODATE_DIR */
36 "Updating '%s' would lose untracked files in it",
38 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
39 "Untracked working tree file '%s' would be overwritten by merge.",
41 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
42 "Untracked working tree file '%s' would be removed by merge.",
44 /* ERROR_BIND_OVERLAP */
45 "Entry '%s' overlaps with '%s'. Cannot bind.",
47 /* ERROR_SPARSE_NOT_UPTODATE_FILE */
48 "Entry '%s' not uptodate. Cannot update sparse checkout.",
50 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
51 "Working tree file '%s' would be overwritten by sparse checkout update.",
53 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
54 "Working tree file '%s' would be removed by sparse checkout update.",
56 /* ERROR_WOULD_LOSE_SUBMODULE */
57 "Submodule '%s' cannot checkout new HEAD.",
60 #define ERRORMSG(o,type) \
61 ( ((o) && (o)->msgs[(type)]) \
62 ? ((o)->msgs[(type)]) \
63 : (unpack_plumbing_errors[(type)]) )
65 static const char *super_prefixed(const char *path
)
68 * It is necessary and sufficient to have two static buffers
69 * here, as the return value of this function is fed to
70 * error() using the unpack_*_errors[] templates we see above.
72 static struct strbuf buf
[2] = {STRBUF_INIT
, STRBUF_INIT
};
73 static int super_prefix_len
= -1;
74 static unsigned idx
= ARRAY_SIZE(buf
) - 1;
76 if (super_prefix_len
< 0) {
77 const char *super_prefix
= get_super_prefix();
82 for (i
= 0; i
< ARRAY_SIZE(buf
); i
++)
83 strbuf_addstr(&buf
[i
], super_prefix
);
84 super_prefix_len
= buf
[0].len
;
88 if (!super_prefix_len
)
91 if (++idx
>= ARRAY_SIZE(buf
))
94 strbuf_setlen(&buf
[idx
], super_prefix_len
);
95 strbuf_addstr(&buf
[idx
], path
);
100 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
104 const char **msgs
= opts
->msgs
;
107 argv_array_init(&opts
->msgs_to_free
);
109 if (!strcmp(cmd
, "checkout"))
110 msg
= advice_commit_before_merge
111 ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
112 "Please commit your changes or stash them before you switch branches.")
113 : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
114 else if (!strcmp(cmd
, "merge"))
115 msg
= advice_commit_before_merge
116 ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
117 "Please commit your changes or stash them before you merge.")
118 : _("Your local changes to the following files would be overwritten by merge:\n%%s");
120 msg
= advice_commit_before_merge
121 ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
122 "Please commit your changes or stash them before you %s.")
123 : _("Your local changes to the following files would be overwritten by %s:\n%%s");
124 msgs
[ERROR_WOULD_OVERWRITE
] = msgs
[ERROR_NOT_UPTODATE_FILE
] =
125 argv_array_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
127 msgs
[ERROR_NOT_UPTODATE_DIR
] =
128 _("Updating the following directories would lose untracked files in them:\n%s");
130 if (!strcmp(cmd
, "checkout"))
131 msg
= advice_commit_before_merge
132 ? _("The following untracked working tree files would be removed by checkout:\n%%s"
133 "Please move or remove them before you switch branches.")
134 : _("The following untracked working tree files would be removed by checkout:\n%%s");
135 else if (!strcmp(cmd
, "merge"))
136 msg
= advice_commit_before_merge
137 ? _("The following untracked working tree files would be removed by merge:\n%%s"
138 "Please move or remove them before you merge.")
139 : _("The following untracked working tree files would be removed by merge:\n%%s");
141 msg
= advice_commit_before_merge
142 ? _("The following untracked working tree files would be removed by %s:\n%%s"
143 "Please move or remove them before you %s.")
144 : _("The following untracked working tree files would be removed by %s:\n%%s");
145 msgs
[ERROR_WOULD_LOSE_UNTRACKED_REMOVED
] =
146 argv_array_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
148 if (!strcmp(cmd
, "checkout"))
149 msg
= advice_commit_before_merge
150 ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
151 "Please move or remove them before you switch branches.")
152 : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
153 else if (!strcmp(cmd
, "merge"))
154 msg
= advice_commit_before_merge
155 ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
156 "Please move or remove them before you merge.")
157 : _("The following untracked working tree files would be overwritten by merge:\n%%s");
159 msg
= advice_commit_before_merge
160 ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
161 "Please move or remove them before you %s.")
162 : _("The following untracked working tree files would be overwritten by %s:\n%%s");
163 msgs
[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
] =
164 argv_array_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
167 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
168 * cannot easily display it as a list.
170 msgs
[ERROR_BIND_OVERLAP
] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
172 msgs
[ERROR_SPARSE_NOT_UPTODATE_FILE
] =
173 _("Cannot update sparse checkout: the following entries are not up to date:\n%s");
174 msgs
[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
] =
175 _("The following working tree files would be overwritten by sparse checkout update:\n%s");
176 msgs
[ERROR_WOULD_LOSE_ORPHANED_REMOVED
] =
177 _("The following working tree files would be removed by sparse checkout update:\n%s");
178 msgs
[ERROR_WOULD_LOSE_SUBMODULE
] =
179 _("Cannot update submodule:\n%s");
181 opts
->show_all_errors
= 1;
182 /* rejected paths may not have a static buffer */
183 for (i
= 0; i
< ARRAY_SIZE(opts
->unpack_rejects
); i
++)
184 opts
->unpack_rejects
[i
].strdup_strings
= 1;
187 void clear_unpack_trees_porcelain(struct unpack_trees_options
*opts
)
189 argv_array_clear(&opts
->msgs_to_free
);
190 memset(opts
->msgs
, 0, sizeof(opts
->msgs
));
193 static int do_add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
194 unsigned int set
, unsigned int clear
)
201 ce
->ce_flags
= (ce
->ce_flags
& ~clear
) | set
;
202 return add_index_entry(&o
->result
, ce
,
203 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
206 static void add_entry(struct unpack_trees_options
*o
,
207 const struct cache_entry
*ce
,
208 unsigned int set
, unsigned int clear
)
210 do_add_entry(o
, dup_cache_entry(ce
, &o
->result
), set
, clear
);
214 * add error messages on path <path>
215 * corresponding to the type <e> with the message <msg>
216 * indicating if it should be display in porcelain or not
218 static int add_rejected_path(struct unpack_trees_options
*o
,
219 enum unpack_trees_error_types e
,
225 if (!o
->show_all_errors
)
226 return error(ERRORMSG(o
, e
), super_prefixed(path
));
229 * Otherwise, insert in a list for future display by
230 * display_error_msgs()
232 string_list_append(&o
->unpack_rejects
[e
], path
);
237 * display all the error messages stored in a nice way
239 static void display_error_msgs(struct unpack_trees_options
*o
)
242 int something_displayed
= 0;
243 for (e
= 0; e
< NB_UNPACK_TREES_ERROR_TYPES
; e
++) {
244 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
245 if (rejects
->nr
> 0) {
246 struct strbuf path
= STRBUF_INIT
;
247 something_displayed
= 1;
248 for (i
= 0; i
< rejects
->nr
; i
++)
249 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
250 error(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
251 strbuf_release(&path
);
253 string_list_clear(rejects
, 0);
255 if (something_displayed
)
256 fprintf(stderr
, _("Aborting\n"));
259 static int check_submodule_move_head(const struct cache_entry
*ce
,
262 struct unpack_trees_options
*o
)
264 unsigned flags
= SUBMODULE_MOVE_HEAD_DRY_RUN
;
265 const struct submodule
*sub
= submodule_from_ce(ce
);
271 flags
|= SUBMODULE_MOVE_HEAD_FORCE
;
273 if (submodule_move_head(ce
->name
, old_id
, new_id
, flags
))
274 return add_rejected_path(o
, ERROR_WOULD_LOSE_SUBMODULE
, ce
->name
);
279 * Preform the loading of the repository's gitmodules file. This function is
280 * used by 'check_update()' to perform loading of the gitmodules file in two
281 * differnt situations:
282 * (1) before removing entries from the working tree if the gitmodules file has
283 * been marked for removal. This situation is specified by 'state' == NULL.
284 * (2) before checking out entries to the working tree if the gitmodules file
285 * has been marked for update. This situation is specified by 'state' != NULL.
287 static void load_gitmodules_file(struct index_state
*index
,
288 struct checkout
*state
)
290 int pos
= index_name_pos(index
, GITMODULES_FILE
, strlen(GITMODULES_FILE
));
293 struct cache_entry
*ce
= index
->cache
[pos
];
294 if (!state
&& ce
->ce_flags
& CE_WT_REMOVE
) {
295 repo_read_gitmodules(the_repository
);
296 } else if (state
&& (ce
->ce_flags
& CE_UPDATE
)) {
297 submodule_free(the_repository
);
298 checkout_entry(ce
, state
, NULL
, NULL
);
299 repo_read_gitmodules(the_repository
);
304 static struct progress
*get_progress(struct unpack_trees_options
*o
)
306 unsigned cnt
= 0, total
= 0;
307 struct index_state
*index
= &o
->result
;
309 if (!o
->update
|| !o
->verbose_update
)
312 for (; cnt
< index
->cache_nr
; cnt
++) {
313 const struct cache_entry
*ce
= index
->cache
[cnt
];
314 if (ce
->ce_flags
& (CE_UPDATE
| CE_WT_REMOVE
))
318 return start_delayed_progress(_("Checking out files"), total
);
321 static void setup_collided_checkout_detection(struct checkout
*state
,
322 struct index_state
*index
)
327 for (i
= 0; i
< index
->cache_nr
; i
++)
328 index
->cache
[i
]->ce_flags
&= ~CE_MATCHED
;
331 static void report_collided_checkout(struct index_state
*index
)
333 struct string_list list
= STRING_LIST_INIT_NODUP
;
336 for (i
= 0; i
< index
->cache_nr
; i
++) {
337 struct cache_entry
*ce
= index
->cache
[i
];
339 if (!(ce
->ce_flags
& CE_MATCHED
))
342 string_list_append(&list
, ce
->name
);
343 ce
->ce_flags
&= ~CE_MATCHED
;
346 list
.cmp
= fspathcmp
;
347 string_list_sort(&list
);
350 warning(_("the following paths have collided (e.g. case-sensitive paths\n"
351 "on a case-insensitive filesystem) and only one from the same\n"
352 "colliding group is in the working tree:\n"));
354 for (i
= 0; i
< list
.nr
; i
++)
355 fprintf(stderr
, " '%s'\n", list
.items
[i
].string
);
358 string_list_clear(&list
, 0);
361 static int check_updates(struct unpack_trees_options
*o
)
365 struct progress
*progress
;
366 struct index_state
*index
= &o
->result
;
367 struct checkout state
= CHECKOUT_INIT
;
370 trace_performance_enter();
373 state
.refresh_cache
= 1;
374 state
.istate
= index
;
377 setup_collided_checkout_detection(&state
, index
);
379 progress
= get_progress(o
);
382 git_attr_set_direction(GIT_ATTR_CHECKOUT
);
384 if (should_update_submodules() && o
->update
&& !o
->dry_run
)
385 load_gitmodules_file(index
, NULL
);
387 for (i
= 0; i
< index
->cache_nr
; i
++) {
388 const struct cache_entry
*ce
= index
->cache
[i
];
390 if (ce
->ce_flags
& CE_WT_REMOVE
) {
391 display_progress(progress
, ++cnt
);
392 if (o
->update
&& !o
->dry_run
)
396 remove_marked_cache_entries(index
, 0);
397 remove_scheduled_dirs();
399 if (should_update_submodules() && o
->update
&& !o
->dry_run
)
400 load_gitmodules_file(index
, &state
);
402 enable_delayed_checkout(&state
);
403 if (repository_format_partial_clone
&& o
->update
&& !o
->dry_run
) {
405 * Prefetch the objects that are to be checked out in the loop
408 struct oid_array to_fetch
= OID_ARRAY_INIT
;
409 for (i
= 0; i
< index
->cache_nr
; i
++) {
410 struct cache_entry
*ce
= index
->cache
[i
];
412 if (!(ce
->ce_flags
& CE_UPDATE
) ||
413 S_ISGITLINK(ce
->ce_mode
))
415 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
417 OBJECT_INFO_FOR_PREFETCH
))
419 oid_array_append(&to_fetch
, &ce
->oid
);
422 fetch_objects(repository_format_partial_clone
,
423 to_fetch
.oid
, to_fetch
.nr
);
424 oid_array_clear(&to_fetch
);
426 for (i
= 0; i
< index
->cache_nr
; i
++) {
427 struct cache_entry
*ce
= index
->cache
[i
];
429 if (ce
->ce_flags
& CE_UPDATE
) {
430 if (ce
->ce_flags
& CE_WT_REMOVE
)
431 BUG("both update and delete flags are set on %s",
433 display_progress(progress
, ++cnt
);
434 ce
->ce_flags
&= ~CE_UPDATE
;
435 if (o
->update
&& !o
->dry_run
) {
436 errs
|= checkout_entry(ce
, &state
, NULL
, NULL
);
440 stop_progress(&progress
);
441 errs
|= finish_delayed_checkout(&state
, NULL
);
443 git_attr_set_direction(GIT_ATTR_CHECKIN
);
446 report_collided_checkout(index
);
448 trace_performance_leave("check_updates");
452 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
453 struct unpack_trees_options
*o
);
454 static int verify_absent_sparse(const struct cache_entry
*ce
,
455 enum unpack_trees_error_types
,
456 struct unpack_trees_options
*o
);
458 static int apply_sparse_checkout(struct index_state
*istate
,
459 struct cache_entry
*ce
,
460 struct unpack_trees_options
*o
)
462 int was_skip_worktree
= ce_skip_worktree(ce
);
464 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
465 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
467 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
468 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
469 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
470 mark_fsmonitor_invalid(istate
, ce
);
471 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
475 * if (!was_skip_worktree && !ce_skip_worktree()) {
476 * This is perfectly normal. Move on;
481 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
482 * area as a result of ce_skip_worktree() shortcuts in
483 * verify_absent() and verify_uptodate().
484 * Make sure they don't modify worktree if they are already
485 * outside checkout area
487 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
488 ce
->ce_flags
&= ~CE_UPDATE
;
491 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
492 * on to get that file removed from both index and worktree.
493 * If that file is already outside worktree area, don't
496 if (ce
->ce_flags
& CE_REMOVE
)
497 ce
->ce_flags
&= ~CE_WT_REMOVE
;
500 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
502 * If CE_UPDATE is set, verify_uptodate() must be called already
503 * also stat info may have lost after merged_entry() so calling
504 * verify_uptodate() again may fail
506 if (!(ce
->ce_flags
& CE_UPDATE
) && verify_uptodate_sparse(ce
, o
))
508 ce
->ce_flags
|= CE_WT_REMOVE
;
509 ce
->ce_flags
&= ~CE_UPDATE
;
511 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
512 if (verify_absent_sparse(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
))
514 ce
->ce_flags
|= CE_UPDATE
;
519 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
520 struct unpack_trees_options
*o
)
522 int ret
= o
->fn(src
, o
);
528 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
530 ce
->ce_flags
|= CE_UNPACKED
;
532 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
533 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
534 int bottom
= o
->cache_bottom
;
535 while (bottom
< o
->src_index
->cache_nr
&&
536 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
538 o
->cache_bottom
= bottom
;
542 static void mark_all_ce_unused(struct index_state
*index
)
545 for (i
= 0; i
< index
->cache_nr
; i
++)
546 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
549 static int locate_in_src_index(const struct cache_entry
*ce
,
550 struct unpack_trees_options
*o
)
552 struct index_state
*index
= o
->src_index
;
553 int len
= ce_namelen(ce
);
554 int pos
= index_name_pos(index
, ce
->name
, len
);
561 * We call unpack_index_entry() with an unmerged cache entry
562 * only in diff-index, and it wants a single callback. Skip
563 * the other unmerged entry with the same name.
565 static void mark_ce_used_same_name(struct cache_entry
*ce
,
566 struct unpack_trees_options
*o
)
568 struct index_state
*index
= o
->src_index
;
569 int len
= ce_namelen(ce
);
572 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
573 struct cache_entry
*next
= index
->cache
[pos
];
574 if (len
!= ce_namelen(next
) ||
575 memcmp(ce
->name
, next
->name
, len
))
577 mark_ce_used(next
, o
);
581 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
583 const struct index_state
*index
= o
->src_index
;
584 int pos
= o
->cache_bottom
;
586 while (pos
< index
->cache_nr
) {
587 struct cache_entry
*ce
= index
->cache
[pos
];
588 if (!(ce
->ce_flags
& CE_UNPACKED
))
595 static void add_same_unmerged(const struct cache_entry
*ce
,
596 struct unpack_trees_options
*o
)
598 struct index_state
*index
= o
->src_index
;
599 int len
= ce_namelen(ce
);
600 int pos
= index_name_pos(index
, ce
->name
, len
);
603 die("programming error in a caller of mark_ce_used_same_name");
604 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
605 struct cache_entry
*next
= index
->cache
[pos
];
606 if (len
!= ce_namelen(next
) ||
607 memcmp(ce
->name
, next
->name
, len
))
609 add_entry(o
, next
, 0, 0);
610 mark_ce_used(next
, o
);
614 static int unpack_index_entry(struct cache_entry
*ce
,
615 struct unpack_trees_options
*o
)
617 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
624 if (o
->skip_unmerged
) {
625 add_entry(o
, ce
, 0, 0);
629 ret
= call_unpack_fn(src
, o
);
631 mark_ce_used_same_name(ce
, o
);
635 static int find_cache_pos(struct traverse_info
*, const char *p
, size_t len
);
637 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
639 struct unpack_trees_options
*o
= info
->data
;
641 if (o
->diff_index_cached
)
643 o
->cache_bottom
= bottom
;
646 static int switch_cache_bottom(struct traverse_info
*info
)
648 struct unpack_trees_options
*o
= info
->data
;
651 if (o
->diff_index_cached
)
653 ret
= o
->cache_bottom
;
654 pos
= find_cache_pos(info
->prev
, info
->name
, info
->namelen
);
657 o
->cache_bottom
= -2 - pos
;
659 o
->cache_bottom
= o
->src_index
->cache_nr
;
663 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
665 return !is_null_oid(&name_j
->oid
) && !is_null_oid(&name_k
->oid
) && oideq(&name_j
->oid
, &name_k
->oid
);
668 static int all_trees_same_as_cache_tree(int n
, unsigned long dirmask
,
669 struct name_entry
*names
,
670 struct traverse_info
*info
)
672 struct unpack_trees_options
*o
= info
->data
;
675 if (!o
->merge
|| dirmask
!= ((1 << n
) - 1))
678 for (i
= 1; i
< n
; i
++)
679 if (!are_same_oid(names
, names
+ i
))
682 return cache_tree_matches_traversal(o
->src_index
->cache_tree
, names
, info
);
685 static int index_pos_by_traverse_info(struct name_entry
*names
,
686 struct traverse_info
*info
)
688 struct unpack_trees_options
*o
= info
->data
;
689 size_t len
= traverse_path_len(info
, names
);
690 char *name
= xmalloc(len
+ 1 /* slash */ + 1 /* NUL */);
693 make_traverse_path(name
, info
, names
->path
, names
->pathlen
);
696 pos
= index_name_pos(o
->src_index
, name
, len
);
698 BUG("This is a directory and should not exist in index");
700 if (!starts_with(o
->src_index
->cache
[pos
]->name
, name
) ||
701 (pos
> 0 && starts_with(o
->src_index
->cache
[pos
-1]->name
, name
)))
702 BUG("pos must point at the first entry in this directory");
708 * Fast path if we detect that all trees are the same as cache-tree at this
709 * path. We'll walk these trees in an iterative loop using cache-tree/index
710 * instead of ODB since we already know what these trees contain.
712 static int traverse_by_cache_tree(int pos
, int nr_entries
, int nr_names
,
713 struct traverse_info
*info
)
715 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
716 struct unpack_trees_options
*o
= info
->data
;
717 struct cache_entry
*tree_ce
= NULL
;
722 BUG("We need cache-tree to do this optimization");
725 * Do what unpack_callback() and unpack_nondirectories() normally
726 * do. But we walk all paths in an iterative loop instead.
728 * D/F conflicts and higher stage entries are not a concern
729 * because cache-tree would be invalidated and we would never
730 * get here in the first place.
732 for (i
= 0; i
< nr_entries
; i
++) {
733 int new_ce_len
, len
, rc
;
735 src
[0] = o
->src_index
->cache
[pos
+ i
];
737 len
= ce_namelen(src
[0]);
738 new_ce_len
= cache_entry_size(len
);
740 if (new_ce_len
> ce_len
) {
742 tree_ce
= xrealloc(tree_ce
, new_ce_len
);
743 memset(tree_ce
, 0, new_ce_len
);
746 tree_ce
->ce_flags
= create_ce_flags(0);
748 for (d
= 1; d
<= nr_names
; d
++)
752 tree_ce
->ce_mode
= src
[0]->ce_mode
;
753 tree_ce
->ce_namelen
= len
;
754 oidcpy(&tree_ce
->oid
, &src
[0]->oid
);
755 memcpy(tree_ce
->name
, src
[0]->name
, len
+ 1);
757 rc
= call_unpack_fn((const struct cache_entry
* const *)src
, o
);
763 mark_ce_used(src
[0], o
);
767 printf("Unpacked %d entries from %s to %s using cache-tree\n",
769 o
->src_index
->cache
[pos
]->name
,
770 o
->src_index
->cache
[pos
+ nr_entries
- 1]->name
);
774 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
775 unsigned long df_conflicts
,
776 struct name_entry
*names
,
777 struct traverse_info
*info
)
779 struct unpack_trees_options
*o
= info
->data
;
782 struct tree_desc t
[MAX_UNPACK_TREES
];
783 void *buf
[MAX_UNPACK_TREES
];
784 struct traverse_info newinfo
;
785 struct name_entry
*p
;
788 nr_entries
= all_trees_same_as_cache_tree(n
, dirmask
, names
, info
);
789 if (nr_entries
> 0) {
790 int pos
= index_pos_by_traverse_info(names
, info
);
792 if (!o
->merge
|| df_conflicts
)
793 BUG("Wrong condition to get here buddy");
796 * All entries up to 'pos' must have been processed
797 * (i.e. marked CE_UNPACKED) at this point. But to be safe,
798 * save and restore cache_bottom anyway to not miss
799 * unprocessed entries before 'pos'.
801 bottom
= o
->cache_bottom
;
802 ret
= traverse_by_cache_tree(pos
, nr_entries
, n
, info
);
803 o
->cache_bottom
= bottom
;
813 newinfo
.pathspec
= info
->pathspec
;
814 newinfo
.name
= p
->path
;
815 newinfo
.namelen
= p
->pathlen
;
816 newinfo
.mode
= p
->mode
;
817 newinfo
.pathlen
= st_add3(newinfo
.pathlen
, tree_entry_len(p
), 1);
818 newinfo
.df_conflicts
|= df_conflicts
;
821 * Fetch the tree from the ODB for each peer directory in the
824 * For 2- and 3-way traversals, we try to avoid hitting the
825 * ODB twice for the same OID. This should yield a nice speed
826 * up in checkouts and merges when the commits are similar.
828 * We don't bother doing the full O(n^2) search for larger n,
829 * because wider traversals don't happen that often and we
830 * avoid the search setup.
832 * When 2 peer OIDs are the same, we just copy the tree
833 * descriptor data. This implicitly borrows the buffer
834 * data from the earlier cell.
836 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
837 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
839 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
842 const struct object_id
*oid
= NULL
;
845 buf
[nr_buf
++] = fill_tree_descriptor(t
+ i
, oid
);
849 bottom
= switch_cache_bottom(&newinfo
);
850 ret
= traverse_trees(o
->src_index
, n
, t
, &newinfo
);
851 restore_cache_bottom(&newinfo
, bottom
);
853 for (i
= 0; i
< nr_buf
; i
++)
860 * Compare the traverse-path to the cache entry without actually
861 * having to generate the textual representation of the traverse
864 * NOTE! This *only* compares up to the size of the traverse path
865 * itself - the caller needs to do the final check for the cache
866 * entry having more data at the end!
868 static int do_compare_entry_piecewise(const struct cache_entry
*ce
,
869 const struct traverse_info
*info
,
870 const char *name
, size_t namelen
,
877 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
878 info
->name
, info
->namelen
,
883 pathlen
= info
->pathlen
;
884 ce_len
= ce_namelen(ce
);
886 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
887 if (ce_len
< pathlen
)
891 ce_name
= ce
->name
+ pathlen
;
893 return df_name_compare(ce_name
, ce_len
, S_IFREG
, name
, namelen
, mode
);
896 static int do_compare_entry(const struct cache_entry
*ce
,
897 const struct traverse_info
*info
,
898 const char *name
, size_t namelen
,
906 * If we have not precomputed the traverse path, it is quicker
907 * to avoid doing so. But if we have precomputed it,
908 * it is quicker to use the precomputed version.
910 if (!info
->traverse_path
)
911 return do_compare_entry_piecewise(ce
, info
, name
, namelen
, mode
);
913 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
917 pathlen
= info
->pathlen
;
918 ce_len
= ce_namelen(ce
);
920 if (ce_len
< pathlen
)
924 ce_name
= ce
->name
+ pathlen
;
926 return df_name_compare(ce_name
, ce_len
, S_IFREG
, name
, namelen
, mode
);
929 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
931 int cmp
= do_compare_entry(ce
, info
, n
->path
, n
->pathlen
, n
->mode
);
936 * Even if the beginning compared identically, the ce should
937 * compare as bigger than a directory leading up to it!
939 return ce_namelen(ce
) > traverse_path_len(info
, n
);
942 static int ce_in_traverse_path(const struct cache_entry
*ce
,
943 const struct traverse_info
*info
)
947 if (do_compare_entry(ce
, info
->prev
,
948 info
->name
, info
->namelen
, info
->mode
))
951 * If ce (blob) is the same name as the path (which is a tree
952 * we will be descending into), it won't be inside it.
954 return (info
->pathlen
< ce_namelen(ce
));
957 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
,
958 const struct name_entry
*n
,
960 struct index_state
*istate
,
963 size_t len
= traverse_path_len(info
, n
);
964 struct cache_entry
*ce
=
966 make_empty_transient_cache_entry(len
) :
967 make_empty_cache_entry(istate
, len
);
969 ce
->ce_mode
= create_ce_mode(n
->mode
);
970 ce
->ce_flags
= create_ce_flags(stage
);
971 ce
->ce_namelen
= len
;
972 oidcpy(&ce
->oid
, &n
->oid
);
973 make_traverse_path(ce
->name
, info
, n
->path
, n
->pathlen
);
979 * Note that traverse_by_cache_tree() duplicates some logic in this function
980 * without actually calling it. If you change the logic here you may need to
981 * check and change there as well.
983 static int unpack_nondirectories(int n
, unsigned long mask
,
984 unsigned long dirmask
,
985 struct cache_entry
**src
,
986 const struct name_entry
*names
,
987 const struct traverse_info
*info
)
990 struct unpack_trees_options
*o
= info
->data
;
991 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
993 /* Do we have *only* directories? Nothing to do */
994 if (mask
== dirmask
&& !src
[0])
998 * Ok, we've filled in up to any potential index entry in src[0],
1001 for (i
= 0; i
< n
; i
++) {
1003 unsigned int bit
= 1ul << i
;
1004 if (conflicts
& bit
) {
1005 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
1012 else if (i
+ 1 < o
->head_idx
)
1014 else if (i
+ 1 > o
->head_idx
)
1020 * If the merge bit is set, then the cache entries are
1021 * discarded in the following block. In this case,
1022 * construct "transient" cache_entries, as they are
1023 * not stored in the index. otherwise construct the
1024 * cache entry from the index aware logic.
1026 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
, &o
->result
, o
->merge
);
1030 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
1032 for (i
= 0; i
< n
; i
++) {
1033 struct cache_entry
*ce
= src
[i
+ o
->merge
];
1034 if (ce
!= o
->df_conflict_entry
)
1035 discard_cache_entry(ce
);
1040 for (i
= 0; i
< n
; i
++)
1041 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
1042 if (do_add_entry(o
, src
[i
], 0, 0))
1048 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
1050 discard_index(&o
->result
);
1051 if (!o
->quiet
&& !o
->exiting_early
) {
1053 return error("%s", message
);
1060 * The tree traversal is looking at name p. If we have a matching entry,
1061 * return it. If name p is a directory in the index, do not return
1062 * anything, as we will want to match it when the traversal descends into
1065 static int find_cache_pos(struct traverse_info
*info
,
1066 const char *p
, size_t p_len
)
1069 struct unpack_trees_options
*o
= info
->data
;
1070 struct index_state
*index
= o
->src_index
;
1071 int pfxlen
= info
->pathlen
;
1073 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
1074 const struct cache_entry
*ce
= index
->cache
[pos
];
1075 const char *ce_name
, *ce_slash
;
1078 if (ce
->ce_flags
& CE_UNPACKED
) {
1080 * cache_bottom entry is already unpacked, so
1081 * we can never match it; don't check it
1084 if (pos
== o
->cache_bottom
)
1088 if (!ce_in_traverse_path(ce
, info
)) {
1090 * Check if we can skip future cache checks
1091 * (because we're already past all possible
1092 * entries in the traverse path).
1094 if (info
->traverse_path
) {
1095 if (strncmp(ce
->name
, info
->traverse_path
,
1101 ce_name
= ce
->name
+ pfxlen
;
1102 ce_slash
= strchr(ce_name
, '/');
1104 ce_len
= ce_slash
- ce_name
;
1106 ce_len
= ce_namelen(ce
) - pfxlen
;
1107 cmp
= name_compare(p
, p_len
, ce_name
, ce_len
);
1109 * Exact match; if we have a directory we need to
1110 * delay returning it.
1113 return ce_slash
? -2 - pos
: pos
;
1115 continue; /* keep looking */
1117 * ce_name sorts after p->path; could it be that we
1118 * have files under p->path directory in the index?
1119 * E.g. ce_name == "t-i", and p->path == "t"; we may
1120 * have "t/a" in the index.
1122 if (p_len
< ce_len
&& !memcmp(ce_name
, p
, p_len
) &&
1123 ce_name
[p_len
] < '/')
1124 continue; /* keep looking */
1130 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
1131 const struct name_entry
*p
)
1133 int pos
= find_cache_pos(info
, p
->path
, p
->pathlen
);
1134 struct unpack_trees_options
*o
= info
->data
;
1137 return o
->src_index
->cache
[pos
];
1142 static void debug_path(struct traverse_info
*info
)
1145 debug_path(info
->prev
);
1146 if (*info
->prev
->name
)
1149 printf("%s", info
->name
);
1152 static void debug_name_entry(int i
, struct name_entry
*n
)
1154 printf("ent#%d %06o %s\n", i
,
1155 n
->path
? n
->mode
: 0,
1156 n
->path
? n
->path
: "(missing)");
1159 static void debug_unpack_callback(int n
,
1161 unsigned long dirmask
,
1162 struct name_entry
*names
,
1163 struct traverse_info
*info
)
1166 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
1170 for (i
= 0; i
< n
; i
++)
1171 debug_name_entry(i
, names
+ i
);
1175 * Note that traverse_by_cache_tree() duplicates some logic in this function
1176 * without actually calling it. If you change the logic here you may need to
1177 * check and change there as well.
1179 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
1181 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
1182 struct unpack_trees_options
*o
= info
->data
;
1183 const struct name_entry
*p
= names
;
1185 /* Find first entry with a real name (we could use "mask" too) */
1189 if (o
->debug_unpack
)
1190 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
1192 /* Are we supposed to look at the index too? */
1196 struct cache_entry
*ce
;
1198 if (o
->diff_index_cached
)
1199 ce
= next_cache_entry(o
);
1201 ce
= find_cache_entry(info
, p
);
1205 cmp
= compare_entry(ce
, info
, p
);
1207 if (unpack_index_entry(ce
, o
) < 0)
1208 return unpack_failed(o
, NULL
);
1214 * If we skip unmerged index
1215 * entries, we'll skip this
1216 * entry *and* the tree
1217 * entries associated with it!
1219 if (o
->skip_unmerged
) {
1220 add_same_unmerged(ce
, o
);
1230 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
1233 if (o
->merge
&& src
[0]) {
1234 if (ce_stage(src
[0]))
1235 mark_ce_used_same_name(src
[0], o
);
1237 mark_ce_used(src
[0], o
);
1240 /* Now handle any directories.. */
1242 /* special case: "diff-index --cached" looking at a tree */
1243 if (o
->diff_index_cached
&&
1244 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1246 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1249 * Everything under the name matches; skip the
1250 * entire hierarchy. diff_index_cached codepath
1251 * special cases D/F conflicts in such a way that
1252 * it does not do any look-ahead, so this is safe.
1255 o
->cache_bottom
+= matches
;
1260 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1269 static int clear_ce_flags_1(struct index_state
*istate
,
1270 struct cache_entry
**cache
, int nr
,
1271 struct strbuf
*prefix
,
1272 int select_mask
, int clear_mask
,
1273 struct exclude_list
*el
, int defval
);
1275 /* Whole directory matching */
1276 static int clear_ce_flags_dir(struct index_state
*istate
,
1277 struct cache_entry
**cache
, int nr
,
1278 struct strbuf
*prefix
,
1280 int select_mask
, int clear_mask
,
1281 struct exclude_list
*el
, int defval
)
1283 struct cache_entry
**cache_end
;
1285 int ret
= is_excluded_from_list(prefix
->buf
, prefix
->len
,
1286 basename
, &dtype
, el
, istate
);
1289 strbuf_addch(prefix
, '/');
1291 /* If undecided, use matching result of parent dir in defval */
1295 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1296 struct cache_entry
*ce
= *cache_end
;
1297 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1302 * TODO: check el, if there are no patterns that may conflict
1303 * with ret (iow, we know in advance the incl/excl
1304 * decision for the entire directory), clear flag here without
1305 * calling clear_ce_flags_1(). That function will call
1306 * the expensive is_excluded_from_list() on every entry.
1308 rc
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1310 select_mask
, clear_mask
,
1312 strbuf_setlen(prefix
, prefix
->len
- 1);
1317 * Traverse the index, find every entry that matches according to
1318 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
1319 * number of traversed entries.
1321 * If select_mask is non-zero, only entries whose ce_flags has on of
1322 * those bits enabled are traversed.
1324 * cache : pointer to an index entry
1325 * prefix_len : an offset to its path
1327 * The current path ("prefix") including the trailing '/' is
1328 * cache[0]->name[0..(prefix_len-1)]
1329 * Top level path has prefix_len zero.
1331 static int clear_ce_flags_1(struct index_state
*istate
,
1332 struct cache_entry
**cache
, int nr
,
1333 struct strbuf
*prefix
,
1334 int select_mask
, int clear_mask
,
1335 struct exclude_list
*el
, int defval
)
1337 struct cache_entry
**cache_end
= cache
+ nr
;
1340 * Process all entries that have the given prefix and meet
1341 * select_mask condition
1343 while(cache
!= cache_end
) {
1344 struct cache_entry
*ce
= *cache
;
1345 const char *name
, *slash
;
1346 int len
, dtype
, ret
;
1348 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1353 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1356 name
= ce
->name
+ prefix
->len
;
1357 slash
= strchr(name
, '/');
1359 /* If it's a directory, try whole directory match first */
1364 strbuf_add(prefix
, name
, len
);
1366 processed
= clear_ce_flags_dir(istate
, cache
, cache_end
- cache
,
1368 prefix
->buf
+ prefix
->len
- len
,
1369 select_mask
, clear_mask
,
1372 /* clear_c_f_dir eats a whole dir already? */
1375 strbuf_setlen(prefix
, prefix
->len
- len
);
1379 strbuf_addch(prefix
, '/');
1380 cache
+= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1382 select_mask
, clear_mask
, el
, defval
);
1383 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1388 dtype
= ce_to_dtype(ce
);
1389 ret
= is_excluded_from_list(ce
->name
, ce_namelen(ce
),
1390 name
, &dtype
, el
, istate
);
1394 ce
->ce_flags
&= ~clear_mask
;
1397 return nr
- (cache_end
- cache
);
1400 static int clear_ce_flags(struct index_state
*istate
,
1401 int select_mask
, int clear_mask
,
1402 struct exclude_list
*el
)
1404 static struct strbuf prefix
= STRBUF_INIT
;
1406 strbuf_reset(&prefix
);
1408 return clear_ce_flags_1(istate
,
1412 select_mask
, clear_mask
,
1417 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1419 static void mark_new_skip_worktree(struct exclude_list
*el
,
1420 struct index_state
*istate
,
1421 int select_flag
, int skip_wt_flag
)
1426 * 1. Pretend the narrowest worktree: only unmerged entries
1429 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1430 struct cache_entry
*ce
= istate
->cache
[i
];
1432 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1435 if (!ce_stage(ce
) && !(ce
->ce_flags
& CE_CONFLICTED
))
1436 ce
->ce_flags
|= skip_wt_flag
;
1438 ce
->ce_flags
&= ~skip_wt_flag
;
1442 * 2. Widen worktree according to sparse-checkout file.
1443 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1445 clear_ce_flags(istate
, select_flag
, skip_wt_flag
, el
);
1448 static int verify_absent(const struct cache_entry
*,
1449 enum unpack_trees_error_types
,
1450 struct unpack_trees_options
*);
1452 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1453 * resulting index, -2 on failure to reflect the changes to the work tree.
1455 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1457 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1460 static struct cache_entry
*dfc
;
1461 struct exclude_list el
;
1463 if (len
> MAX_UNPACK_TREES
)
1464 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1466 trace_performance_enter();
1467 memset(&el
, 0, sizeof(el
));
1468 if (!core_apply_sparse_checkout
|| !o
->update
)
1469 o
->skip_sparse_checkout
= 1;
1470 if (!o
->skip_sparse_checkout
) {
1471 char *sparse
= git_pathdup("info/sparse-checkout");
1472 if (add_excludes_from_file_to_list(sparse
, "", 0, &el
, NULL
) < 0)
1473 o
->skip_sparse_checkout
= 1;
1479 memset(&o
->result
, 0, sizeof(o
->result
));
1480 o
->result
.initialized
= 1;
1481 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1482 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1483 o
->result
.version
= o
->src_index
->version
;
1484 if (!o
->src_index
->split_index
) {
1485 o
->result
.split_index
= NULL
;
1486 } else if (o
->src_index
== o
->dst_index
) {
1488 * o->dst_index (and thus o->src_index) will be discarded
1489 * and overwritten with o->result at the end of this function,
1490 * so just use src_index's split_index to avoid having to
1493 o
->result
.split_index
= o
->src_index
->split_index
;
1494 o
->result
.split_index
->refcount
++;
1496 o
->result
.split_index
= init_split_index(&o
->result
);
1498 oidcpy(&o
->result
.oid
, &o
->src_index
->oid
);
1499 o
->merge_size
= len
;
1500 mark_all_ce_unused(o
->src_index
);
1503 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1505 if (!o
->skip_sparse_checkout
)
1506 mark_new_skip_worktree(o
->el
, o
->src_index
, 0, CE_NEW_SKIP_WORKTREE
);
1509 dfc
= xcalloc(1, cache_entry_size(0));
1510 o
->df_conflict_entry
= dfc
;
1513 const char *prefix
= o
->prefix
? o
->prefix
: "";
1514 struct traverse_info info
;
1516 setup_traverse_info(&info
, prefix
);
1517 info
.fn
= unpack_callback
;
1519 info
.show_all_errors
= o
->show_all_errors
;
1520 info
.pathspec
= o
->pathspec
;
1524 * Unpack existing index entries that sort before the
1525 * prefix the tree is spliced into. Note that o->merge
1526 * is always true in this case.
1529 struct cache_entry
*ce
= next_cache_entry(o
);
1532 if (ce_in_traverse_path(ce
, &info
))
1534 if (unpack_index_entry(ce
, o
) < 0)
1539 trace_performance_enter();
1540 ret
= traverse_trees(o
->src_index
, len
, t
, &info
);
1541 trace_performance_leave("traverse_trees");
1546 /* Any left-over entries in the index? */
1549 struct cache_entry
*ce
= next_cache_entry(o
);
1552 if (unpack_index_entry(ce
, o
) < 0)
1556 mark_all_ce_unused(o
->src_index
);
1558 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1559 ret
= unpack_failed(o
, "Merge requires file-level merging");
1563 if (!o
->skip_sparse_checkout
) {
1564 int empty_worktree
= 1;
1567 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1568 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1569 * so apply_sparse_checkout() won't attempt to remove it from worktree
1571 mark_new_skip_worktree(o
->el
, &o
->result
, CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1574 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1575 struct cache_entry
*ce
= o
->result
.cache
[i
];
1578 * Entries marked with CE_ADDED in merged_entry() do not have
1579 * verify_absent() check (the check is effectively disabled
1580 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1582 * Do the real check now because we have had
1583 * correct CE_NEW_SKIP_WORKTREE
1585 if (ce
->ce_flags
& CE_ADDED
&&
1586 verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1587 if (!o
->show_all_errors
)
1592 if (apply_sparse_checkout(&o
->result
, ce
, o
)) {
1593 if (!o
->show_all_errors
)
1597 if (!ce_skip_worktree(ce
))
1604 * Sparse checkout is meant to narrow down checkout area
1605 * but it does not make sense to narrow down to empty working
1606 * tree. This is usually a mistake in sparse checkout rules.
1607 * Do not allow users to do that.
1609 if (o
->result
.cache_nr
&& empty_worktree
) {
1610 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1615 ret
= check_updates(o
) ? (-2) : 0;
1617 move_index_extensions(&o
->result
, o
->src_index
);
1619 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
1620 cache_tree_verify(the_repository
, &o
->result
);
1621 if (!o
->result
.cache_tree
)
1622 o
->result
.cache_tree
= cache_tree();
1623 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1624 cache_tree_update(&o
->result
,
1629 o
->result
.updated_workdir
= 1;
1630 discard_index(o
->dst_index
);
1631 *o
->dst_index
= o
->result
;
1633 discard_index(&o
->result
);
1635 o
->src_index
= NULL
;
1638 trace_performance_leave("unpack_trees");
1639 clear_exclude_list(&el
);
1643 if (o
->show_all_errors
)
1644 display_error_msgs(o
);
1645 mark_all_ce_unused(o
->src_index
);
1646 ret
= unpack_failed(o
, NULL
);
1647 if (o
->exiting_early
)
1652 /* Here come the merge functions */
1654 static int reject_merge(const struct cache_entry
*ce
,
1655 struct unpack_trees_options
*o
)
1657 return add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1660 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1666 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1668 return a
->ce_mode
== b
->ce_mode
&&
1669 oideq(&a
->oid
, &b
->oid
);
1674 * When a CE gets turned into an unmerged entry, we
1675 * want it to be up-to-date
1677 static int verify_uptodate_1(const struct cache_entry
*ce
,
1678 struct unpack_trees_options
*o
,
1679 enum unpack_trees_error_types error_type
)
1687 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1688 * if this entry is truly up-to-date because this file may be
1691 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1692 ; /* keep checking */
1693 else if (o
->reset
|| ce_uptodate(ce
))
1696 if (!lstat(ce
->name
, &st
)) {
1697 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1698 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1700 if (submodule_from_ce(ce
)) {
1701 int r
= check_submodule_move_head(ce
,
1702 "HEAD", oid_to_hex(&ce
->oid
), o
);
1704 return add_rejected_path(o
, error_type
, ce
->name
);
1711 * Historic default policy was to allow submodule to be out
1712 * of sync wrt the superproject index. If the submodule was
1713 * not considered interesting above, we don't care here.
1715 if (S_ISGITLINK(ce
->ce_mode
))
1720 if (errno
== ENOENT
)
1722 return add_rejected_path(o
, error_type
, ce
->name
);
1725 int verify_uptodate(const struct cache_entry
*ce
,
1726 struct unpack_trees_options
*o
)
1728 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1730 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1733 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1734 struct unpack_trees_options
*o
)
1736 return verify_uptodate_1(ce
, o
, ERROR_SPARSE_NOT_UPTODATE_FILE
);
1740 * TODO: We should actually invalidate o->result, not src_index [1].
1741 * But since cache tree and untracked cache both are not copied to
1742 * o->result until unpacking is complete, we invalidate them on
1743 * src_index instead with the assumption that they will be copied to
1744 * dst_index at the end.
1746 * [1] src_index->cache_tree is also used in unpack_callback() so if
1747 * we invalidate o->result, we need to update it to use
1748 * o->result.cache_tree as well.
1750 static void invalidate_ce_path(const struct cache_entry
*ce
,
1751 struct unpack_trees_options
*o
)
1755 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1756 untracked_cache_invalidate_path(o
->src_index
, ce
->name
, 1);
1760 * Check that checking out ce->sha1 in subdir ce->name is not
1761 * going to overwrite any working files.
1763 * Currently, git does not checkout subprojects during a superproject
1764 * checkout, so it is not going to overwrite anything.
1766 static int verify_clean_submodule(const char *old_sha1
,
1767 const struct cache_entry
*ce
,
1768 struct unpack_trees_options
*o
)
1770 if (!submodule_from_ce(ce
))
1773 return check_submodule_move_head(ce
, old_sha1
,
1774 oid_to_hex(&ce
->oid
), o
);
1777 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1778 struct unpack_trees_options
*o
)
1781 * we are about to extract "ce->name"; we would not want to lose
1782 * anything in the existing directory there.
1786 struct dir_struct d
;
1790 if (S_ISGITLINK(ce
->ce_mode
)) {
1791 struct object_id oid
;
1792 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", &oid
);
1794 * If we are not going to update the submodule, then
1797 if (!sub_head
&& oideq(&oid
, &ce
->oid
))
1799 return verify_clean_submodule(sub_head
? NULL
: oid_to_hex(&oid
),
1804 * First let's make sure we do not have a local modification
1805 * in that directory.
1807 namelen
= ce_namelen(ce
);
1808 for (i
= locate_in_src_index(ce
, o
);
1809 i
< o
->src_index
->cache_nr
;
1811 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1812 int len
= ce_namelen(ce2
);
1813 if (len
< namelen
||
1814 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1815 ce2
->name
[namelen
] != '/')
1818 * ce2->name is an entry in the subdirectory to be
1821 if (!ce_stage(ce2
)) {
1822 if (verify_uptodate(ce2
, o
))
1824 add_entry(o
, ce2
, CE_REMOVE
, 0);
1825 invalidate_ce_path(ce
, o
);
1826 mark_ce_used(ce2
, o
);
1832 * Then we need to make sure that we do not lose a locally
1833 * present file that is not ignored.
1835 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
1837 memset(&d
, 0, sizeof(d
));
1839 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
1840 i
= read_directory(&d
, o
->src_index
, pathbuf
, namelen
+1, NULL
);
1842 return add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
1848 * This gets called when there was no index entry for the tree entry 'dst',
1849 * but we found a file in the working tree that 'lstat()' said was fine,
1850 * and we're on a case-insensitive filesystem.
1852 * See if we can find a case-insensitive match in the index that also
1853 * matches the stat information, and assume it's that other file!
1855 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
1857 const struct cache_entry
*src
;
1859 src
= index_file_exists(o
->src_index
, name
, len
, 1);
1860 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
1863 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
1864 const struct cache_entry
*ce
, struct stat
*st
,
1865 enum unpack_trees_error_types error_type
,
1866 struct unpack_trees_options
*o
)
1868 const struct cache_entry
*result
;
1871 * It may be that the 'lstat()' succeeded even though
1872 * target 'ce' was absent, because there is an old
1873 * entry that is different only in case..
1875 * Ignore that lstat() if it matches.
1877 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
1881 is_excluded(o
->dir
, o
->src_index
, name
, &dtype
))
1883 * ce->name is explicitly excluded, so it is Ok to
1887 if (S_ISDIR(st
->st_mode
)) {
1889 * We are checking out path "foo" and
1890 * found "foo/." in the working tree.
1891 * This is tricky -- if we have modified
1892 * files that are in "foo/" we would lose
1895 if (verify_clean_subdirectory(ce
, o
) < 0)
1901 * The previous round may already have decided to
1902 * delete this path, which is in a subdirectory that
1903 * is being replaced with a blob.
1905 result
= index_file_exists(&o
->result
, name
, len
, 0);
1907 if (result
->ce_flags
& CE_REMOVE
)
1911 return add_rejected_path(o
, error_type
, name
);
1915 * We do not want to remove or overwrite a working tree file that
1916 * is not tracked, unless it is ignored.
1918 static int verify_absent_1(const struct cache_entry
*ce
,
1919 enum unpack_trees_error_types error_type
,
1920 struct unpack_trees_options
*o
)
1925 if (o
->index_only
|| o
->reset
|| !o
->update
)
1928 len
= check_leading_path(ce
->name
, ce_namelen(ce
));
1935 path
= xmemdupz(ce
->name
, len
);
1936 if (lstat(path
, &st
))
1937 ret
= error_errno("cannot stat '%s'", path
);
1939 if (submodule_from_ce(ce
))
1940 ret
= check_submodule_move_head(ce
,
1941 oid_to_hex(&ce
->oid
),
1944 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
1945 &st
, error_type
, o
);
1949 } else if (lstat(ce
->name
, &st
)) {
1950 if (errno
!= ENOENT
)
1951 return error_errno("cannot stat '%s'", ce
->name
);
1954 if (submodule_from_ce(ce
))
1955 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
1958 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
1959 ce_to_dtype(ce
), ce
, &st
,
1964 static int verify_absent(const struct cache_entry
*ce
,
1965 enum unpack_trees_error_types error_type
,
1966 struct unpack_trees_options
*o
)
1968 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1970 return verify_absent_1(ce
, error_type
, o
);
1973 static int verify_absent_sparse(const struct cache_entry
*ce
,
1974 enum unpack_trees_error_types error_type
,
1975 struct unpack_trees_options
*o
)
1977 enum unpack_trees_error_types orphaned_error
= error_type
;
1978 if (orphaned_error
== ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
)
1979 orphaned_error
= ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
;
1981 return verify_absent_1(ce
, orphaned_error
, o
);
1984 static int merged_entry(const struct cache_entry
*ce
,
1985 const struct cache_entry
*old
,
1986 struct unpack_trees_options
*o
)
1988 int update
= CE_UPDATE
;
1989 struct cache_entry
*merge
= dup_cache_entry(ce
, &o
->result
);
1993 * New index entries. In sparse checkout, the following
1994 * verify_absent() will be delayed until after
1995 * traverse_trees() finishes in unpack_trees(), then:
1997 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1998 * - verify_absent() be called again, this time with
1999 * correct CE_NEW_SKIP_WORKTREE
2001 * verify_absent() call here does nothing in sparse
2002 * checkout (i.e. o->skip_sparse_checkout == 0)
2005 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
2007 if (verify_absent(merge
,
2008 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
2009 discard_cache_entry(merge
);
2012 invalidate_ce_path(merge
, o
);
2014 if (submodule_from_ce(ce
)) {
2015 int ret
= check_submodule_move_head(ce
, NULL
,
2016 oid_to_hex(&ce
->oid
),
2022 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
2024 * See if we can re-use the old CE directly?
2025 * That way we get the uptodate stat info.
2027 * This also removes the UPDATE flag on a match; otherwise
2028 * we will end up overwriting local changes in the work tree.
2030 if (same(old
, merge
)) {
2031 copy_cache_entry(merge
, old
);
2034 if (verify_uptodate(old
, o
)) {
2035 discard_cache_entry(merge
);
2038 /* Migrate old flags over */
2039 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
2040 invalidate_ce_path(old
, o
);
2043 if (submodule_from_ce(ce
)) {
2044 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
2045 oid_to_hex(&ce
->oid
),
2052 * Previously unmerged entry left as an existence
2053 * marker by read_index_unmerged();
2055 invalidate_ce_path(old
, o
);
2058 do_add_entry(o
, merge
, update
, CE_STAGEMASK
);
2062 static int deleted_entry(const struct cache_entry
*ce
,
2063 const struct cache_entry
*old
,
2064 struct unpack_trees_options
*o
)
2066 /* Did it exist in the index? */
2068 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2072 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
2074 add_entry(o
, ce
, CE_REMOVE
, 0);
2075 invalidate_ce_path(ce
, o
);
2079 static int keep_entry(const struct cache_entry
*ce
,
2080 struct unpack_trees_options
*o
)
2082 add_entry(o
, ce
, 0, 0);
2084 invalidate_ce_path(ce
, o
);
2089 static void show_stage_entry(FILE *o
,
2090 const char *label
, const struct cache_entry
*ce
)
2093 fprintf(o
, "%s (missing)\n", label
);
2095 fprintf(o
, "%s%06o %s %d\t%s\n",
2098 oid_to_hex(&ce
->oid
),
2104 int threeway_merge(const struct cache_entry
* const *stages
,
2105 struct unpack_trees_options
*o
)
2107 const struct cache_entry
*index
;
2108 const struct cache_entry
*head
;
2109 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
2112 int remote_match
= 0;
2114 int df_conflict_head
= 0;
2115 int df_conflict_remote
= 0;
2117 int any_anc_missing
= 0;
2118 int no_anc_exists
= 1;
2121 for (i
= 1; i
< o
->head_idx
; i
++) {
2122 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
2123 any_anc_missing
= 1;
2129 head
= stages
[o
->head_idx
];
2131 if (head
== o
->df_conflict_entry
) {
2132 df_conflict_head
= 1;
2136 if (remote
== o
->df_conflict_entry
) {
2137 df_conflict_remote
= 1;
2142 * First, if there's a #16 situation, note that to prevent #13
2145 if (!same(remote
, head
)) {
2146 for (i
= 1; i
< o
->head_idx
; i
++) {
2147 if (same(stages
[i
], head
)) {
2150 if (same(stages
[i
], remote
)) {
2157 * We start with cases where the index is allowed to match
2158 * something other than the head: #14(ALT) and #2ALT, where it
2159 * is permitted to match the result instead.
2161 /* #14, #14ALT, #2ALT */
2162 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
2163 if (index
&& !same(index
, remote
) && !same(index
, head
))
2164 return reject_merge(index
, o
);
2165 return merged_entry(remote
, index
, o
);
2168 * If we have an entry in the index cache, then we want to
2169 * make sure that it matches head.
2171 if (index
&& !same(index
, head
))
2172 return reject_merge(index
, o
);
2176 if (same(head
, remote
))
2177 return merged_entry(head
, index
, o
);
2179 if (!df_conflict_remote
&& remote_match
&& !head_match
)
2180 return merged_entry(head
, index
, o
);
2184 if (!head
&& !remote
&& any_anc_missing
)
2188 * Under the "aggressive" rule, we resolve mostly trivial
2189 * cases that we historically had git-merge-one-file resolve.
2191 if (o
->aggressive
) {
2192 int head_deleted
= !head
;
2193 int remote_deleted
= !remote
;
2194 const struct cache_entry
*ce
= NULL
;
2203 for (i
= 1; i
< o
->head_idx
; i
++) {
2204 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2213 * Deleted in one and unchanged in the other.
2215 if ((head_deleted
&& remote_deleted
) ||
2216 (head_deleted
&& remote
&& remote_match
) ||
2217 (remote_deleted
&& head
&& head_match
)) {
2219 return deleted_entry(index
, index
, o
);
2220 if (ce
&& !head_deleted
) {
2221 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2227 * Added in both, identically.
2229 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
2230 return merged_entry(head
, index
, o
);
2234 /* Below are "no merge" cases, which require that the index be
2235 * up-to-date to avoid the files getting overwritten with
2236 * conflict resolution files.
2239 if (verify_uptodate(index
, o
))
2243 o
->nontrivial_merge
= 1;
2245 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2247 if (!head_match
|| !remote_match
) {
2248 for (i
= 1; i
< o
->head_idx
; i
++) {
2249 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2250 keep_entry(stages
[i
], o
);
2258 fprintf(stderr
, "read-tree: warning #16 detected\n");
2259 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2260 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2263 if (head
) { count
+= keep_entry(head
, o
); }
2264 if (remote
) { count
+= keep_entry(remote
, o
); }
2271 * The rule is to "carry forward" what is in the index without losing
2272 * information across a "fast-forward", favoring a successful merge
2273 * over a merge failure when it makes sense. For details of the
2274 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2277 int twoway_merge(const struct cache_entry
* const *src
,
2278 struct unpack_trees_options
*o
)
2280 const struct cache_entry
*current
= src
[0];
2281 const struct cache_entry
*oldtree
= src
[1];
2282 const struct cache_entry
*newtree
= src
[2];
2284 if (o
->merge_size
!= 2)
2285 return error("Cannot do a twoway merge of %d trees",
2288 if (oldtree
== o
->df_conflict_entry
)
2290 if (newtree
== o
->df_conflict_entry
)
2294 if (current
->ce_flags
& CE_CONFLICTED
) {
2295 if (same(oldtree
, newtree
) || o
->reset
) {
2297 return deleted_entry(current
, current
, o
);
2299 return merged_entry(newtree
, current
, o
);
2301 return reject_merge(current
, o
);
2302 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2303 (!oldtree
&& newtree
&&
2304 same(current
, newtree
)) || /* 6 and 7 */
2305 (oldtree
&& newtree
&&
2306 same(oldtree
, newtree
)) || /* 14 and 15 */
2307 (oldtree
&& newtree
&&
2308 !same(oldtree
, newtree
) && /* 18 and 19 */
2309 same(current
, newtree
))) {
2310 return keep_entry(current
, o
);
2311 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2313 return deleted_entry(oldtree
, current
, o
);
2314 } else if (oldtree
&& newtree
&&
2315 same(current
, oldtree
) && !same(current
, newtree
)) {
2317 return merged_entry(newtree
, current
, o
);
2319 return reject_merge(current
, o
);
2322 if (oldtree
&& !o
->initial_checkout
) {
2324 * deletion of the path was staged;
2326 if (same(oldtree
, newtree
))
2328 return reject_merge(oldtree
, o
);
2330 return merged_entry(newtree
, current
, o
);
2332 return deleted_entry(oldtree
, current
, o
);
2338 * Keep the index entries at stage0, collapse stage1 but make sure
2339 * stage0 does not have anything there.
2341 int bind_merge(const struct cache_entry
* const *src
,
2342 struct unpack_trees_options
*o
)
2344 const struct cache_entry
*old
= src
[0];
2345 const struct cache_entry
*a
= src
[1];
2347 if (o
->merge_size
!= 1)
2348 return error("Cannot do a bind merge of %d trees",
2351 return o
->quiet
? -1 :
2352 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2353 super_prefixed(a
->name
),
2354 super_prefixed(old
->name
));
2356 return keep_entry(old
, o
);
2358 return merged_entry(a
, NULL
, o
);
2365 * - take the stat information from stage0, take the data from stage1
2367 int oneway_merge(const struct cache_entry
* const *src
,
2368 struct unpack_trees_options
*o
)
2370 const struct cache_entry
*old
= src
[0];
2371 const struct cache_entry
*a
= src
[1];
2373 if (o
->merge_size
!= 1)
2374 return error("Cannot do a oneway merge of %d trees",
2377 if (!a
|| a
== o
->df_conflict_entry
)
2378 return deleted_entry(old
, old
, o
);
2380 if (old
&& same(old
, a
)) {
2382 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
)) {
2384 if (lstat(old
->name
, &st
) ||
2385 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2386 update
|= CE_UPDATE
;
2388 if (o
->update
&& S_ISGITLINK(old
->ce_mode
) &&
2389 should_update_submodules() && !verify_uptodate(old
, o
))
2390 update
|= CE_UPDATE
;
2391 add_entry(o
, old
, update
, CE_STAGEMASK
);
2394 return merged_entry(a
, old
, o
);