3 #include "repository.h"
8 #include "cache-tree.h"
9 #include "unpack-trees.h"
13 #include "split-index.h"
14 #include "submodule.h"
15 #include "submodule-config.h"
16 #include "fsmonitor.h"
17 #include "object-store.h"
18 #include "promisor-remote.h"
20 #include "parallel-checkout.h"
23 * Error messages expected by scripts out of plumbing commands such as
24 * read-tree. Non-scripted Porcelain is not required to use these messages
25 * and in fact are encouraged to reword them to better suit their particular
26 * situation better. See how "git checkout" and "git merge" replaces
27 * them using setup_unpack_trees_porcelain(), for example.
29 static const char *unpack_plumbing_errors
[NB_UNPACK_TREES_WARNING_TYPES
] = {
30 /* ERROR_WOULD_OVERWRITE */
31 "Entry '%s' would be overwritten by merge. Cannot merge.",
33 /* ERROR_NOT_UPTODATE_FILE */
34 "Entry '%s' not uptodate. Cannot merge.",
36 /* ERROR_NOT_UPTODATE_DIR */
37 "Updating '%s' would lose untracked files in it",
39 /* ERROR_CWD_IN_THE_WAY */
40 "Refusing to remove '%s' since it is the current working directory.",
42 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
43 "Untracked working tree file '%s' would be overwritten by merge.",
45 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
46 "Untracked working tree file '%s' would be removed by merge.",
48 /* ERROR_BIND_OVERLAP */
49 "Entry '%s' overlaps with '%s'. Cannot bind.",
51 /* ERROR_WOULD_LOSE_SUBMODULE */
52 "Submodule '%s' cannot checkout new HEAD.",
54 /* NB_UNPACK_TREES_ERROR_TYPES; just a meta value */
57 /* WARNING_SPARSE_NOT_UPTODATE_FILE */
58 "Path '%s' not uptodate; will not remove from working tree.",
60 /* WARNING_SPARSE_UNMERGED_FILE */
61 "Path '%s' unmerged; will not remove from working tree.",
63 /* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */
64 "Path '%s' already present; will not overwrite with sparse update.",
67 #define ERRORMSG(o,type) \
68 ( ((o) && (o)->msgs[(type)]) \
69 ? ((o)->msgs[(type)]) \
70 : (unpack_plumbing_errors[(type)]) )
72 static const char *super_prefixed(const char *path
)
75 * It is necessary and sufficient to have two static buffers
76 * here, as the return value of this function is fed to
77 * error() using the unpack_*_errors[] templates we see above.
79 static struct strbuf buf
[2] = {STRBUF_INIT
, STRBUF_INIT
};
80 static int super_prefix_len
= -1;
81 static unsigned idx
= ARRAY_SIZE(buf
) - 1;
83 if (super_prefix_len
< 0) {
84 const char *super_prefix
= get_super_prefix();
89 for (i
= 0; i
< ARRAY_SIZE(buf
); i
++)
90 strbuf_addstr(&buf
[i
], super_prefix
);
91 super_prefix_len
= buf
[0].len
;
95 if (!super_prefix_len
)
98 if (++idx
>= ARRAY_SIZE(buf
))
101 strbuf_setlen(&buf
[idx
], super_prefix_len
);
102 strbuf_addstr(&buf
[idx
], path
);
107 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
111 const char **msgs
= opts
->msgs
;
114 strvec_init(&opts
->msgs_to_free
);
116 if (!strcmp(cmd
, "checkout"))
117 msg
= advice_enabled(ADVICE_COMMIT_BEFORE_MERGE
)
118 ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
119 "Please commit your changes or stash them before you switch branches.")
120 : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
121 else if (!strcmp(cmd
, "merge"))
122 msg
= advice_enabled(ADVICE_COMMIT_BEFORE_MERGE
)
123 ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
124 "Please commit your changes or stash them before you merge.")
125 : _("Your local changes to the following files would be overwritten by merge:\n%%s");
127 msg
= advice_enabled(ADVICE_COMMIT_BEFORE_MERGE
)
128 ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
129 "Please commit your changes or stash them before you %s.")
130 : _("Your local changes to the following files would be overwritten by %s:\n%%s");
131 msgs
[ERROR_WOULD_OVERWRITE
] = msgs
[ERROR_NOT_UPTODATE_FILE
] =
132 strvec_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
134 msgs
[ERROR_NOT_UPTODATE_DIR
] =
135 _("Updating the following directories would lose untracked files in them:\n%s");
137 msgs
[ERROR_CWD_IN_THE_WAY
] =
138 _("Refusing to remove the current working directory:\n%s");
140 if (!strcmp(cmd
, "checkout"))
141 msg
= advice_enabled(ADVICE_COMMIT_BEFORE_MERGE
)
142 ? _("The following untracked working tree files would be removed by checkout:\n%%s"
143 "Please move or remove them before you switch branches.")
144 : _("The following untracked working tree files would be removed by checkout:\n%%s");
145 else if (!strcmp(cmd
, "merge"))
146 msg
= advice_enabled(ADVICE_COMMIT_BEFORE_MERGE
)
147 ? _("The following untracked working tree files would be removed by merge:\n%%s"
148 "Please move or remove them before you merge.")
149 : _("The following untracked working tree files would be removed by merge:\n%%s");
151 msg
= advice_enabled(ADVICE_COMMIT_BEFORE_MERGE
)
152 ? _("The following untracked working tree files would be removed by %s:\n%%s"
153 "Please move or remove them before you %s.")
154 : _("The following untracked working tree files would be removed by %s:\n%%s");
155 msgs
[ERROR_WOULD_LOSE_UNTRACKED_REMOVED
] =
156 strvec_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
158 if (!strcmp(cmd
, "checkout"))
159 msg
= advice_enabled(ADVICE_COMMIT_BEFORE_MERGE
)
160 ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
161 "Please move or remove them before you switch branches.")
162 : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
163 else if (!strcmp(cmd
, "merge"))
164 msg
= advice_enabled(ADVICE_COMMIT_BEFORE_MERGE
)
165 ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
166 "Please move or remove them before you merge.")
167 : _("The following untracked working tree files would be overwritten by merge:\n%%s");
169 msg
= advice_enabled(ADVICE_COMMIT_BEFORE_MERGE
)
170 ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
171 "Please move or remove them before you %s.")
172 : _("The following untracked working tree files would be overwritten by %s:\n%%s");
173 msgs
[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
] =
174 strvec_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
177 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
178 * cannot easily display it as a list.
180 msgs
[ERROR_BIND_OVERLAP
] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
182 msgs
[ERROR_WOULD_LOSE_SUBMODULE
] =
183 _("Cannot update submodule:\n%s");
185 msgs
[WARNING_SPARSE_NOT_UPTODATE_FILE
] =
186 _("The following paths are not up to date and were left despite sparse patterns:\n%s");
187 msgs
[WARNING_SPARSE_UNMERGED_FILE
] =
188 _("The following paths are unmerged and were left despite sparse patterns:\n%s");
189 msgs
[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
] =
190 _("The following paths were already present and thus not updated despite sparse patterns:\n%s");
192 opts
->show_all_errors
= 1;
193 /* rejected paths may not have a static buffer */
194 for (i
= 0; i
< ARRAY_SIZE(opts
->unpack_rejects
); i
++)
195 opts
->unpack_rejects
[i
].strdup_strings
= 1;
198 void clear_unpack_trees_porcelain(struct unpack_trees_options
*opts
)
200 strvec_clear(&opts
->msgs_to_free
);
201 memset(opts
->msgs
, 0, sizeof(opts
->msgs
));
204 static int do_add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
205 unsigned int set
, unsigned int clear
)
212 ce
->ce_flags
= (ce
->ce_flags
& ~clear
) | set
;
213 return add_index_entry(&o
->result
, ce
,
214 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
217 static void add_entry(struct unpack_trees_options
*o
,
218 const struct cache_entry
*ce
,
219 unsigned int set
, unsigned int clear
)
221 do_add_entry(o
, dup_cache_entry(ce
, &o
->result
), set
, clear
);
225 * add error messages on path <path>
226 * corresponding to the type <e> with the message <msg>
227 * indicating if it should be display in porcelain or not
229 static int add_rejected_path(struct unpack_trees_options
*o
,
230 enum unpack_trees_error_types e
,
236 if (!o
->show_all_errors
)
237 return error(ERRORMSG(o
, e
), super_prefixed(path
));
240 * Otherwise, insert in a list for future display by
241 * display_(error|warning)_msgs()
243 string_list_append(&o
->unpack_rejects
[e
], path
);
248 * display all the error messages stored in a nice way
250 static void display_error_msgs(struct unpack_trees_options
*o
)
253 unsigned error_displayed
= 0;
254 for (e
= 0; e
< NB_UNPACK_TREES_ERROR_TYPES
; e
++) {
255 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
257 if (rejects
->nr
> 0) {
259 struct strbuf path
= STRBUF_INIT
;
262 for (i
= 0; i
< rejects
->nr
; i
++)
263 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
264 error(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
265 strbuf_release(&path
);
267 string_list_clear(rejects
, 0);
270 fprintf(stderr
, _("Aborting\n"));
274 * display all the warning messages stored in a nice way
276 static void display_warning_msgs(struct unpack_trees_options
*o
)
279 unsigned warning_displayed
= 0;
280 for (e
= NB_UNPACK_TREES_ERROR_TYPES
+ 1;
281 e
< NB_UNPACK_TREES_WARNING_TYPES
; e
++) {
282 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
284 if (rejects
->nr
> 0) {
286 struct strbuf path
= STRBUF_INIT
;
288 warning_displayed
= 1;
289 for (i
= 0; i
< rejects
->nr
; i
++)
290 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
291 warning(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
292 strbuf_release(&path
);
294 string_list_clear(rejects
, 0);
296 if (warning_displayed
)
297 fprintf(stderr
, _("After fixing the above paths, you may want to run `git sparse-checkout reapply`.\n"));
299 static int check_submodule_move_head(const struct cache_entry
*ce
,
302 struct unpack_trees_options
*o
)
304 unsigned flags
= SUBMODULE_MOVE_HEAD_DRY_RUN
;
305 const struct submodule
*sub
= submodule_from_ce(ce
);
311 flags
|= SUBMODULE_MOVE_HEAD_FORCE
;
313 if (submodule_move_head(ce
->name
, old_id
, new_id
, flags
))
314 return add_rejected_path(o
, ERROR_WOULD_LOSE_SUBMODULE
, ce
->name
);
319 * Perform the loading of the repository's gitmodules file. This function is
320 * used by 'check_update()' to perform loading of the gitmodules file in two
321 * different situations:
322 * (1) before removing entries from the working tree if the gitmodules file has
323 * been marked for removal. This situation is specified by 'state' == NULL.
324 * (2) before checking out entries to the working tree if the gitmodules file
325 * has been marked for update. This situation is specified by 'state' != NULL.
327 static void load_gitmodules_file(struct index_state
*index
,
328 struct checkout
*state
)
330 int pos
= index_name_pos(index
, GITMODULES_FILE
, strlen(GITMODULES_FILE
));
333 struct cache_entry
*ce
= index
->cache
[pos
];
334 if (!state
&& ce
->ce_flags
& CE_WT_REMOVE
) {
335 repo_read_gitmodules(the_repository
, 0);
336 } else if (state
&& (ce
->ce_flags
& CE_UPDATE
)) {
337 submodule_free(the_repository
);
338 checkout_entry(ce
, state
, NULL
, NULL
);
339 repo_read_gitmodules(the_repository
, 0);
344 static struct progress
*get_progress(struct unpack_trees_options
*o
,
345 struct index_state
*index
)
347 unsigned cnt
= 0, total
= 0;
349 if (!o
->update
|| !o
->verbose_update
)
352 for (; cnt
< index
->cache_nr
; cnt
++) {
353 const struct cache_entry
*ce
= index
->cache
[cnt
];
354 if (ce
->ce_flags
& (CE_UPDATE
| CE_WT_REMOVE
))
358 return start_delayed_progress(_("Updating files"), total
);
361 static void setup_collided_checkout_detection(struct checkout
*state
,
362 struct index_state
*index
)
367 for (i
= 0; i
< index
->cache_nr
; i
++)
368 index
->cache
[i
]->ce_flags
&= ~CE_MATCHED
;
371 static void report_collided_checkout(struct index_state
*index
)
373 struct string_list list
= STRING_LIST_INIT_NODUP
;
376 for (i
= 0; i
< index
->cache_nr
; i
++) {
377 struct cache_entry
*ce
= index
->cache
[i
];
379 if (!(ce
->ce_flags
& CE_MATCHED
))
382 string_list_append(&list
, ce
->name
);
383 ce
->ce_flags
&= ~CE_MATCHED
;
386 list
.cmp
= fspathcmp
;
387 string_list_sort(&list
);
390 warning(_("the following paths have collided (e.g. case-sensitive paths\n"
391 "on a case-insensitive filesystem) and only one from the same\n"
392 "colliding group is in the working tree:\n"));
394 for (i
= 0; i
< list
.nr
; i
++)
395 fprintf(stderr
, " '%s'\n", list
.items
[i
].string
);
398 string_list_clear(&list
, 0);
401 static int must_checkout(const struct cache_entry
*ce
)
403 return ce
->ce_flags
& CE_UPDATE
;
406 static int check_updates(struct unpack_trees_options
*o
,
407 struct index_state
*index
)
411 struct progress
*progress
;
412 struct checkout state
= CHECKOUT_INIT
;
413 int i
, pc_workers
, pc_threshold
;
415 trace_performance_enter();
418 state
.refresh_cache
= 1;
419 state
.istate
= index
;
420 clone_checkout_metadata(&state
.meta
, &o
->meta
, NULL
);
422 if (!o
->update
|| o
->dry_run
) {
423 remove_marked_cache_entries(index
, 0);
424 trace_performance_leave("check_updates");
429 setup_collided_checkout_detection(&state
, index
);
431 progress
= get_progress(o
, index
);
433 /* Start with clean cache to avoid using any possibly outdated info. */
434 invalidate_lstat_cache();
436 git_attr_set_direction(GIT_ATTR_CHECKOUT
);
438 if (should_update_submodules())
439 load_gitmodules_file(index
, NULL
);
441 for (i
= 0; i
< index
->cache_nr
; i
++) {
442 const struct cache_entry
*ce
= index
->cache
[i
];
444 if (ce
->ce_flags
& CE_WT_REMOVE
) {
445 display_progress(progress
, ++cnt
);
450 remove_marked_cache_entries(index
, 0);
451 remove_scheduled_dirs();
453 if (should_update_submodules())
454 load_gitmodules_file(index
, &state
);
456 if (has_promisor_remote())
458 * Prefetch the objects that are to be checked out in the loop
461 prefetch_cache_entries(index
, must_checkout
);
463 get_parallel_checkout_configs(&pc_workers
, &pc_threshold
);
465 enable_delayed_checkout(&state
);
467 init_parallel_checkout();
468 for (i
= 0; i
< index
->cache_nr
; i
++) {
469 struct cache_entry
*ce
= index
->cache
[i
];
471 if (must_checkout(ce
)) {
472 size_t last_pc_queue_size
= pc_queue_size();
474 if (ce
->ce_flags
& CE_WT_REMOVE
)
475 BUG("both update and delete flags are set on %s",
477 ce
->ce_flags
&= ~CE_UPDATE
;
478 errs
|= checkout_entry(ce
, &state
, NULL
, NULL
);
480 if (last_pc_queue_size
== pc_queue_size())
481 display_progress(progress
, ++cnt
);
485 errs
|= run_parallel_checkout(&state
, pc_workers
, pc_threshold
,
487 stop_progress(&progress
);
488 errs
|= finish_delayed_checkout(&state
, NULL
, o
->verbose_update
);
489 git_attr_set_direction(GIT_ATTR_CHECKIN
);
492 report_collided_checkout(index
);
494 trace_performance_leave("check_updates");
498 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
499 struct unpack_trees_options
*o
);
500 static int verify_absent_sparse(const struct cache_entry
*ce
,
501 enum unpack_trees_error_types
,
502 struct unpack_trees_options
*o
);
504 static int apply_sparse_checkout(struct index_state
*istate
,
505 struct cache_entry
*ce
,
506 struct unpack_trees_options
*o
)
508 int was_skip_worktree
= ce_skip_worktree(ce
);
510 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
511 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
513 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
514 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
515 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
516 mark_fsmonitor_invalid(istate
, ce
);
517 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
521 * if (!was_skip_worktree && !ce_skip_worktree()) {
522 * This is perfectly normal. Move on;
527 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
528 * area as a result of ce_skip_worktree() shortcuts in
529 * verify_absent() and verify_uptodate().
530 * Make sure they don't modify worktree if they are already
531 * outside checkout area
533 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
534 ce
->ce_flags
&= ~CE_UPDATE
;
537 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
538 * on to get that file removed from both index and worktree.
539 * If that file is already outside worktree area, don't
542 if (ce
->ce_flags
& CE_REMOVE
)
543 ce
->ce_flags
&= ~CE_WT_REMOVE
;
546 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
548 * If CE_UPDATE is set, verify_uptodate() must be called already
549 * also stat info may have lost after merged_entry() so calling
550 * verify_uptodate() again may fail
552 if (!(ce
->ce_flags
& CE_UPDATE
) &&
553 verify_uptodate_sparse(ce
, o
)) {
554 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
557 ce
->ce_flags
|= CE_WT_REMOVE
;
558 ce
->ce_flags
&= ~CE_UPDATE
;
560 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
561 if (verify_absent_sparse(ce
, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
, o
))
563 ce
->ce_flags
|= CE_UPDATE
;
568 static int warn_conflicted_path(struct index_state
*istate
,
570 struct unpack_trees_options
*o
)
572 char *conflicting_path
= istate
->cache
[i
]->name
;
575 add_rejected_path(o
, WARNING_SPARSE_UNMERGED_FILE
, conflicting_path
);
577 /* Find out how many higher stage entries are at same path */
578 while ((++count
) + i
< istate
->cache_nr
&&
579 !strcmp(conflicting_path
, istate
->cache
[count
+ i
]->name
))
585 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
586 struct unpack_trees_options
*o
)
588 int ret
= o
->fn(src
, o
);
594 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
596 ce
->ce_flags
|= CE_UNPACKED
;
599 * If this is a sparse directory, don't advance cache_bottom.
600 * That will be advanced later using the cache-tree data.
602 if (S_ISSPARSEDIR(ce
->ce_mode
))
605 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
606 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
607 int bottom
= o
->cache_bottom
;
608 while (bottom
< o
->src_index
->cache_nr
&&
609 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
611 o
->cache_bottom
= bottom
;
615 static void mark_all_ce_unused(struct index_state
*index
)
618 for (i
= 0; i
< index
->cache_nr
; i
++)
619 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
622 static int locate_in_src_index(const struct cache_entry
*ce
,
623 struct unpack_trees_options
*o
)
625 struct index_state
*index
= o
->src_index
;
626 int len
= ce_namelen(ce
);
627 int pos
= index_name_pos(index
, ce
->name
, len
);
634 * We call unpack_index_entry() with an unmerged cache entry
635 * only in diff-index, and it wants a single callback. Skip
636 * the other unmerged entry with the same name.
638 static void mark_ce_used_same_name(struct cache_entry
*ce
,
639 struct unpack_trees_options
*o
)
641 struct index_state
*index
= o
->src_index
;
642 int len
= ce_namelen(ce
);
645 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
646 struct cache_entry
*next
= index
->cache
[pos
];
647 if (len
!= ce_namelen(next
) ||
648 memcmp(ce
->name
, next
->name
, len
))
650 mark_ce_used(next
, o
);
654 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
, int *hint
)
656 const struct index_state
*index
= o
->src_index
;
657 int pos
= o
->cache_bottom
;
662 while (pos
< index
->cache_nr
) {
663 struct cache_entry
*ce
= index
->cache
[pos
];
664 if (!(ce
->ce_flags
& CE_UNPACKED
)) {
675 static void add_same_unmerged(const struct cache_entry
*ce
,
676 struct unpack_trees_options
*o
)
678 struct index_state
*index
= o
->src_index
;
679 int len
= ce_namelen(ce
);
680 int pos
= index_name_pos(index
, ce
->name
, len
);
683 die("programming error in a caller of mark_ce_used_same_name");
684 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
685 struct cache_entry
*next
= index
->cache
[pos
];
686 if (len
!= ce_namelen(next
) ||
687 memcmp(ce
->name
, next
->name
, len
))
689 add_entry(o
, next
, 0, 0);
690 mark_ce_used(next
, o
);
694 static int unpack_index_entry(struct cache_entry
*ce
,
695 struct unpack_trees_options
*o
)
697 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
704 if (o
->skip_unmerged
) {
705 add_entry(o
, ce
, 0, 0);
709 ret
= call_unpack_fn(src
, o
);
711 mark_ce_used_same_name(ce
, o
);
715 static int find_cache_pos(struct traverse_info
*, const char *p
, size_t len
);
717 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
719 struct unpack_trees_options
*o
= info
->data
;
721 if (o
->diff_index_cached
)
723 o
->cache_bottom
= bottom
;
726 static int switch_cache_bottom(struct traverse_info
*info
)
728 struct unpack_trees_options
*o
= info
->data
;
731 if (o
->diff_index_cached
)
733 ret
= o
->cache_bottom
;
734 pos
= find_cache_pos(info
->prev
, info
->name
, info
->namelen
);
737 o
->cache_bottom
= -2 - pos
;
739 o
->cache_bottom
= o
->src_index
->cache_nr
;
743 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
745 return !is_null_oid(&name_j
->oid
) && !is_null_oid(&name_k
->oid
) && oideq(&name_j
->oid
, &name_k
->oid
);
748 static int all_trees_same_as_cache_tree(int n
, unsigned long dirmask
,
749 struct name_entry
*names
,
750 struct traverse_info
*info
)
752 struct unpack_trees_options
*o
= info
->data
;
755 if (!o
->merge
|| dirmask
!= ((1 << n
) - 1))
758 for (i
= 1; i
< n
; i
++)
759 if (!are_same_oid(names
, names
+ i
))
762 return cache_tree_matches_traversal(o
->src_index
->cache_tree
, names
, info
);
765 static int index_pos_by_traverse_info(struct name_entry
*names
,
766 struct traverse_info
*info
)
768 struct unpack_trees_options
*o
= info
->data
;
769 struct strbuf name
= STRBUF_INIT
;
772 strbuf_make_traverse_path(&name
, info
, names
->path
, names
->pathlen
);
773 strbuf_addch(&name
, '/');
774 pos
= index_name_pos(o
->src_index
, name
.buf
, name
.len
);
776 if (!o
->src_index
->sparse_index
||
777 !(o
->src_index
->cache
[pos
]->ce_flags
& CE_SKIP_WORKTREE
))
778 BUG("This is a directory and should not exist in index");
782 if (pos
>= o
->src_index
->cache_nr
||
783 !starts_with(o
->src_index
->cache
[pos
]->name
, name
.buf
) ||
784 (pos
> 0 && starts_with(o
->src_index
->cache
[pos
-1]->name
, name
.buf
)))
785 BUG("pos %d doesn't point to the first entry of %s in index",
787 strbuf_release(&name
);
792 * Fast path if we detect that all trees are the same as cache-tree at this
793 * path. We'll walk these trees in an iterative loop using cache-tree/index
794 * instead of ODB since we already know what these trees contain.
796 static int traverse_by_cache_tree(int pos
, int nr_entries
, int nr_names
,
797 struct traverse_info
*info
)
799 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
800 struct unpack_trees_options
*o
= info
->data
;
801 struct cache_entry
*tree_ce
= NULL
;
806 BUG("We need cache-tree to do this optimization");
809 * Do what unpack_callback() and unpack_single_entry() normally
810 * do. But we walk all paths in an iterative loop instead.
812 * D/F conflicts and higher stage entries are not a concern
813 * because cache-tree would be invalidated and we would never
814 * get here in the first place.
816 for (i
= 0; i
< nr_entries
; i
++) {
817 int new_ce_len
, len
, rc
;
819 src
[0] = o
->src_index
->cache
[pos
+ i
];
821 len
= ce_namelen(src
[0]);
822 new_ce_len
= cache_entry_size(len
);
824 if (new_ce_len
> ce_len
) {
826 tree_ce
= xrealloc(tree_ce
, new_ce_len
);
827 memset(tree_ce
, 0, new_ce_len
);
830 tree_ce
->ce_flags
= create_ce_flags(0);
832 for (d
= 1; d
<= nr_names
; d
++)
836 tree_ce
->ce_mode
= src
[0]->ce_mode
;
837 tree_ce
->ce_namelen
= len
;
838 oidcpy(&tree_ce
->oid
, &src
[0]->oid
);
839 memcpy(tree_ce
->name
, src
[0]->name
, len
+ 1);
841 rc
= call_unpack_fn((const struct cache_entry
* const *)src
, o
);
847 mark_ce_used(src
[0], o
);
851 printf("Unpacked %d entries from %s to %s using cache-tree\n",
853 o
->src_index
->cache
[pos
]->name
,
854 o
->src_index
->cache
[pos
+ nr_entries
- 1]->name
);
858 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
859 unsigned long df_conflicts
,
860 struct name_entry
*names
,
861 struct traverse_info
*info
)
863 struct unpack_trees_options
*o
= info
->data
;
866 struct tree_desc t
[MAX_UNPACK_TREES
];
867 void *buf
[MAX_UNPACK_TREES
];
868 struct traverse_info newinfo
;
869 struct name_entry
*p
;
872 nr_entries
= all_trees_same_as_cache_tree(n
, dirmask
, names
, info
);
873 if (nr_entries
> 0) {
874 int pos
= index_pos_by_traverse_info(names
, info
);
876 if (!o
->merge
|| df_conflicts
)
877 BUG("Wrong condition to get here buddy");
880 * All entries up to 'pos' must have been processed
881 * (i.e. marked CE_UNPACKED) at this point. But to be safe,
882 * save and restore cache_bottom anyway to not miss
883 * unprocessed entries before 'pos'.
885 bottom
= o
->cache_bottom
;
886 ret
= traverse_by_cache_tree(pos
, nr_entries
, n
, info
);
887 o
->cache_bottom
= bottom
;
897 newinfo
.pathspec
= info
->pathspec
;
898 newinfo
.name
= p
->path
;
899 newinfo
.namelen
= p
->pathlen
;
900 newinfo
.mode
= p
->mode
;
901 newinfo
.pathlen
= st_add3(newinfo
.pathlen
, tree_entry_len(p
), 1);
902 newinfo
.df_conflicts
|= df_conflicts
;
905 * Fetch the tree from the ODB for each peer directory in the
908 * For 2- and 3-way traversals, we try to avoid hitting the
909 * ODB twice for the same OID. This should yield a nice speed
910 * up in checkouts and merges when the commits are similar.
912 * We don't bother doing the full O(n^2) search for larger n,
913 * because wider traversals don't happen that often and we
914 * avoid the search setup.
916 * When 2 peer OIDs are the same, we just copy the tree
917 * descriptor data. This implicitly borrows the buffer
918 * data from the earlier cell.
920 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
921 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
923 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
926 const struct object_id
*oid
= NULL
;
929 buf
[nr_buf
++] = fill_tree_descriptor(the_repository
, t
+ i
, oid
);
933 bottom
= switch_cache_bottom(&newinfo
);
934 ret
= traverse_trees(o
->src_index
, n
, t
, &newinfo
);
935 restore_cache_bottom(&newinfo
, bottom
);
937 for (i
= 0; i
< nr_buf
; i
++)
944 * Compare the traverse-path to the cache entry without actually
945 * having to generate the textual representation of the traverse
948 * NOTE! This *only* compares up to the size of the traverse path
949 * itself - the caller needs to do the final check for the cache
950 * entry having more data at the end!
952 static int do_compare_entry_piecewise(const struct cache_entry
*ce
,
953 const struct traverse_info
*info
,
954 const char *name
, size_t namelen
,
961 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
962 info
->name
, info
->namelen
,
967 pathlen
= info
->pathlen
;
968 ce_len
= ce_namelen(ce
);
970 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
971 if (ce_len
< pathlen
)
975 ce_name
= ce
->name
+ pathlen
;
977 return df_name_compare(ce_name
, ce_len
, S_IFREG
, name
, namelen
, mode
);
980 static int do_compare_entry(const struct cache_entry
*ce
,
981 const struct traverse_info
*info
,
982 const char *name
, size_t namelen
,
991 * If we have not precomputed the traverse path, it is quicker
992 * to avoid doing so. But if we have precomputed it,
993 * it is quicker to use the precomputed version.
995 if (!info
->traverse_path
)
996 return do_compare_entry_piecewise(ce
, info
, name
, namelen
, mode
);
998 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
1002 pathlen
= info
->pathlen
;
1003 ce_len
= ce_namelen(ce
);
1005 if (ce_len
< pathlen
)
1009 ce_name
= ce
->name
+ pathlen
;
1011 ce_mode
= S_ISSPARSEDIR(ce
->ce_mode
) ? S_IFDIR
: S_IFREG
;
1012 return df_name_compare(ce_name
, ce_len
, ce_mode
, name
, namelen
, mode
);
1015 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
1017 int cmp
= do_compare_entry(ce
, info
, n
->path
, n
->pathlen
, n
->mode
);
1022 * At this point, we know that we have a prefix match. If ce
1023 * is a sparse directory, then allow an exact match. This only
1024 * works when the input name is a directory, since ce->name
1025 * ends in a directory separator.
1027 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
1028 ce
->ce_namelen
== traverse_path_len(info
, tree_entry_len(n
)) + 1)
1032 * Even if the beginning compared identically, the ce should
1033 * compare as bigger than a directory leading up to it!
1035 return ce_namelen(ce
) > traverse_path_len(info
, tree_entry_len(n
));
1038 static int ce_in_traverse_path(const struct cache_entry
*ce
,
1039 const struct traverse_info
*info
)
1043 if (do_compare_entry(ce
, info
->prev
,
1044 info
->name
, info
->namelen
, info
->mode
))
1047 * If ce (blob) is the same name as the path (which is a tree
1048 * we will be descending into), it won't be inside it.
1050 return (info
->pathlen
< ce_namelen(ce
));
1053 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
,
1054 const struct name_entry
*n
,
1056 struct index_state
*istate
,
1058 int is_sparse_directory
)
1060 size_t len
= traverse_path_len(info
, tree_entry_len(n
));
1061 size_t alloc_len
= is_sparse_directory
? len
+ 1 : len
;
1062 struct cache_entry
*ce
=
1064 make_empty_transient_cache_entry(alloc_len
, NULL
) :
1065 make_empty_cache_entry(istate
, alloc_len
);
1067 ce
->ce_mode
= create_ce_mode(n
->mode
);
1068 ce
->ce_flags
= create_ce_flags(stage
);
1069 ce
->ce_namelen
= len
;
1070 oidcpy(&ce
->oid
, &n
->oid
);
1071 /* len+1 because the cache_entry allocates space for NUL */
1072 make_traverse_path(ce
->name
, len
+ 1, info
, n
->path
, n
->pathlen
);
1074 if (is_sparse_directory
) {
1075 ce
->name
[len
] = '/';
1076 ce
->name
[len
+ 1] = '\0';
1078 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
1085 * Note that traverse_by_cache_tree() duplicates some logic in this function
1086 * without actually calling it. If you change the logic here you may need to
1087 * check and change there as well.
1089 static int unpack_single_entry(int n
, unsigned long mask
,
1090 unsigned long dirmask
,
1091 struct cache_entry
**src
,
1092 const struct name_entry
*names
,
1093 const struct traverse_info
*info
)
1096 struct unpack_trees_options
*o
= info
->data
;
1097 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
1099 if (mask
== dirmask
&& !src
[0])
1103 * When we have a sparse directory entry for src[0],
1104 * then this isn't necessarily a directory-file conflict.
1106 if (mask
== dirmask
&& src
[0] &&
1107 S_ISSPARSEDIR(src
[0]->ce_mode
))
1111 * Ok, we've filled in up to any potential index entry in src[0],
1114 for (i
= 0; i
< n
; i
++) {
1116 unsigned int bit
= 1ul << i
;
1117 if (conflicts
& bit
) {
1118 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
1125 else if (i
+ 1 < o
->head_idx
)
1127 else if (i
+ 1 > o
->head_idx
)
1133 * If the merge bit is set, then the cache entries are
1134 * discarded in the following block. In this case,
1135 * construct "transient" cache_entries, as they are
1136 * not stored in the index. otherwise construct the
1137 * cache entry from the index aware logic.
1139 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
,
1140 &o
->result
, o
->merge
,
1145 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
1147 for (i
= 0; i
< n
; i
++) {
1148 struct cache_entry
*ce
= src
[i
+ o
->merge
];
1149 if (ce
!= o
->df_conflict_entry
)
1150 discard_cache_entry(ce
);
1155 for (i
= 0; i
< n
; i
++)
1156 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
1157 if (do_add_entry(o
, src
[i
], 0, 0))
1163 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
1165 discard_index(&o
->result
);
1166 if (!o
->quiet
&& !o
->exiting_early
) {
1168 return error("%s", message
);
1175 * The tree traversal is looking at name p. If we have a matching entry,
1176 * return it. If name p is a directory in the index, do not return
1177 * anything, as we will want to match it when the traversal descends into
1180 static int find_cache_pos(struct traverse_info
*info
,
1181 const char *p
, size_t p_len
)
1184 struct unpack_trees_options
*o
= info
->data
;
1185 struct index_state
*index
= o
->src_index
;
1186 int pfxlen
= info
->pathlen
;
1188 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
1189 const struct cache_entry
*ce
= index
->cache
[pos
];
1190 const char *ce_name
, *ce_slash
;
1193 if (ce
->ce_flags
& CE_UNPACKED
) {
1195 * cache_bottom entry is already unpacked, so
1196 * we can never match it; don't check it
1199 if (pos
== o
->cache_bottom
)
1203 if (!ce_in_traverse_path(ce
, info
)) {
1205 * Check if we can skip future cache checks
1206 * (because we're already past all possible
1207 * entries in the traverse path).
1209 if (info
->traverse_path
) {
1210 if (strncmp(ce
->name
, info
->traverse_path
,
1216 ce_name
= ce
->name
+ pfxlen
;
1217 ce_slash
= strchr(ce_name
, '/');
1219 ce_len
= ce_slash
- ce_name
;
1221 ce_len
= ce_namelen(ce
) - pfxlen
;
1222 cmp
= name_compare(p
, p_len
, ce_name
, ce_len
);
1224 * Exact match; if we have a directory we need to
1225 * delay returning it.
1228 return ce_slash
? -2 - pos
: pos
;
1230 continue; /* keep looking */
1232 * ce_name sorts after p->path; could it be that we
1233 * have files under p->path directory in the index?
1234 * E.g. ce_name == "t-i", and p->path == "t"; we may
1235 * have "t/a" in the index.
1237 if (p_len
< ce_len
&& !memcmp(ce_name
, p
, p_len
) &&
1238 ce_name
[p_len
] < '/')
1239 continue; /* keep looking */
1246 * Given a sparse directory entry 'ce', compare ce->name to
1247 * info->traverse_path + p->path + '/' if info->traverse_path
1250 * Compare ce->name to p->path + '/' otherwise. Note that
1251 * ce->name must end in a trailing '/' because it is a sparse
1254 static int sparse_dir_matches_path(const struct cache_entry
*ce
,
1255 struct traverse_info
*info
,
1256 const struct name_entry
*p
)
1258 assert(S_ISSPARSEDIR(ce
->ce_mode
));
1259 assert(ce
->name
[ce
->ce_namelen
- 1] == '/');
1262 return ce
->ce_namelen
== info
->pathlen
+ p
->pathlen
+ 1 &&
1263 ce
->name
[info
->pathlen
- 1] == '/' &&
1264 !strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
) &&
1265 !strncmp(ce
->name
+ info
->pathlen
, p
->path
, p
->pathlen
);
1266 return ce
->ce_namelen
== p
->pathlen
+ 1 &&
1267 !strncmp(ce
->name
, p
->path
, p
->pathlen
);
1270 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
1271 const struct name_entry
*p
)
1274 int pos
= find_cache_pos(info
, p
->path
, p
->pathlen
);
1275 struct unpack_trees_options
*o
= info
->data
;
1278 return o
->src_index
->cache
[pos
];
1281 * Check for a sparse-directory entry named "path/".
1282 * Due to the input p->path not having a trailing
1283 * slash, the negative 'pos' value overshoots the
1284 * expected position, hence "-2" instead of "-1".
1288 if (pos
< 0 || pos
>= o
->src_index
->cache_nr
)
1292 * Due to lexicographic sorting and sparse directory
1293 * entries ending with a trailing slash, our path as a
1294 * sparse directory (e.g "subdir/") and our path as a
1295 * file (e.g. "subdir") might be separated by other
1296 * paths (e.g. "subdir-").
1299 struct cache_entry
*ce
= o
->src_index
->cache
[pos
];
1301 if (!skip_prefix(ce
->name
, info
->traverse_path
, &path
) ||
1302 strncmp(path
, p
->path
, p
->pathlen
) ||
1303 path
[p
->pathlen
] != '/')
1306 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
1307 sparse_dir_matches_path(ce
, info
, p
))
1316 static void debug_path(struct traverse_info
*info
)
1319 debug_path(info
->prev
);
1320 if (*info
->prev
->name
)
1323 printf("%s", info
->name
);
1326 static void debug_name_entry(int i
, struct name_entry
*n
)
1328 printf("ent#%d %06o %s\n", i
,
1329 n
->path
? n
->mode
: 0,
1330 n
->path
? n
->path
: "(missing)");
1333 static void debug_unpack_callback(int n
,
1335 unsigned long dirmask
,
1336 struct name_entry
*names
,
1337 struct traverse_info
*info
)
1340 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
1344 for (i
= 0; i
< n
; i
++)
1345 debug_name_entry(i
, names
+ i
);
1349 * Returns true if and only if the given cache_entry is a
1350 * sparse-directory entry that matches the given name_entry
1351 * from the tree walk at the given traverse_info.
1353 static int is_sparse_directory_entry(struct cache_entry
*ce
,
1354 struct name_entry
*name
,
1355 struct traverse_info
*info
)
1357 if (!ce
|| !name
|| !S_ISSPARSEDIR(ce
->ce_mode
))
1360 return sparse_dir_matches_path(ce
, info
, name
);
1364 * Note that traverse_by_cache_tree() duplicates some logic in this function
1365 * without actually calling it. If you change the logic here you may need to
1366 * check and change there as well.
1368 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
1370 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
1371 struct unpack_trees_options
*o
= info
->data
;
1372 const struct name_entry
*p
= names
;
1374 /* Find first entry with a real name (we could use "mask" too) */
1378 if (o
->debug_unpack
)
1379 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
1381 /* Are we supposed to look at the index too? */
1386 struct cache_entry
*ce
;
1388 if (o
->diff_index_cached
)
1389 ce
= next_cache_entry(o
, &hint
);
1391 ce
= find_cache_entry(info
, p
);
1395 cmp
= compare_entry(ce
, info
, p
);
1397 if (unpack_index_entry(ce
, o
) < 0)
1398 return unpack_failed(o
, NULL
);
1404 * If we skip unmerged index
1405 * entries, we'll skip this
1406 * entry *and* the tree
1407 * entries associated with it!
1409 if (o
->skip_unmerged
) {
1410 add_same_unmerged(ce
, o
);
1420 if (unpack_single_entry(n
, mask
, dirmask
, src
, names
, info
) < 0)
1423 if (o
->merge
&& src
[0]) {
1424 if (ce_stage(src
[0]))
1425 mark_ce_used_same_name(src
[0], o
);
1427 mark_ce_used(src
[0], o
);
1430 /* Now handle any directories.. */
1432 /* special case: "diff-index --cached" looking at a tree */
1433 if (o
->diff_index_cached
&&
1434 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1436 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1439 * Everything under the name matches; skip the
1440 * entire hierarchy. diff_index_cached codepath
1441 * special cases D/F conflicts in such a way that
1442 * it does not do any look-ahead, so this is safe.
1445 o
->cache_bottom
+= matches
;
1450 if (!is_sparse_directory_entry(src
[0], names
, info
) &&
1451 traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1462 static int clear_ce_flags_1(struct index_state
*istate
,
1463 struct cache_entry
**cache
, int nr
,
1464 struct strbuf
*prefix
,
1465 int select_mask
, int clear_mask
,
1466 struct pattern_list
*pl
,
1467 enum pattern_match_result default_match
,
1470 /* Whole directory matching */
1471 static int clear_ce_flags_dir(struct index_state
*istate
,
1472 struct cache_entry
**cache
, int nr
,
1473 struct strbuf
*prefix
,
1475 int select_mask
, int clear_mask
,
1476 struct pattern_list
*pl
,
1477 enum pattern_match_result default_match
,
1480 struct cache_entry
**cache_end
;
1483 enum pattern_match_result ret
, orig_ret
;
1484 orig_ret
= path_matches_pattern_list(prefix
->buf
, prefix
->len
,
1485 basename
, &dtype
, pl
, istate
);
1487 strbuf_addch(prefix
, '/');
1489 /* If undecided, use matching result of parent dir in defval */
1490 if (orig_ret
== UNDECIDED
)
1491 ret
= default_match
;
1495 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1496 struct cache_entry
*ce
= *cache_end
;
1497 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1501 if (pl
->use_cone_patterns
&& orig_ret
== MATCHED_RECURSIVE
) {
1502 struct cache_entry
**ce
= cache
;
1503 rc
= cache_end
- cache
;
1505 while (ce
< cache_end
) {
1506 (*ce
)->ce_flags
&= ~clear_mask
;
1509 } else if (pl
->use_cone_patterns
&& orig_ret
== NOT_MATCHED
) {
1510 rc
= cache_end
- cache
;
1512 rc
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1514 select_mask
, clear_mask
,
1519 strbuf_setlen(prefix
, prefix
->len
- 1);
1524 * Traverse the index, find every entry that matches according to
1525 * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the
1526 * number of traversed entries.
1528 * If select_mask is non-zero, only entries whose ce_flags has on of
1529 * those bits enabled are traversed.
1531 * cache : pointer to an index entry
1532 * prefix_len : an offset to its path
1534 * The current path ("prefix") including the trailing '/' is
1535 * cache[0]->name[0..(prefix_len-1)]
1536 * Top level path has prefix_len zero.
1538 static int clear_ce_flags_1(struct index_state
*istate
,
1539 struct cache_entry
**cache
, int nr
,
1540 struct strbuf
*prefix
,
1541 int select_mask
, int clear_mask
,
1542 struct pattern_list
*pl
,
1543 enum pattern_match_result default_match
,
1546 struct cache_entry
**cache_end
= nr
? cache
+ nr
: cache
;
1549 * Process all entries that have the given prefix and meet
1550 * select_mask condition
1552 while(cache
!= cache_end
) {
1553 struct cache_entry
*ce
= *cache
;
1554 const char *name
, *slash
;
1556 enum pattern_match_result ret
;
1558 display_progress(istate
->progress
, progress_nr
);
1560 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1566 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1569 name
= ce
->name
+ prefix
->len
;
1570 slash
= strchr(name
, '/');
1572 /* If it's a directory, try whole directory match first */
1577 strbuf_add(prefix
, name
, len
);
1579 processed
= clear_ce_flags_dir(istate
, cache
, cache_end
- cache
,
1581 prefix
->buf
+ prefix
->len
- len
,
1582 select_mask
, clear_mask
,
1586 /* clear_c_f_dir eats a whole dir already? */
1589 progress_nr
+= processed
;
1590 strbuf_setlen(prefix
, prefix
->len
- len
);
1594 strbuf_addch(prefix
, '/');
1595 processed
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1597 select_mask
, clear_mask
, pl
,
1598 default_match
, progress_nr
);
1601 progress_nr
+= processed
;
1603 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1608 dtype
= ce_to_dtype(ce
);
1609 ret
= path_matches_pattern_list(ce
->name
,
1611 name
, &dtype
, pl
, istate
);
1612 if (ret
== UNDECIDED
)
1613 ret
= default_match
;
1614 if (ret
== MATCHED
|| ret
== MATCHED_RECURSIVE
)
1615 ce
->ce_flags
&= ~clear_mask
;
1620 display_progress(istate
->progress
, progress_nr
);
1621 return nr
- (cache_end
- cache
);
1624 static int clear_ce_flags(struct index_state
*istate
,
1625 int select_mask
, int clear_mask
,
1626 struct pattern_list
*pl
,
1629 static struct strbuf prefix
= STRBUF_INIT
;
1633 strbuf_reset(&prefix
);
1635 istate
->progress
= start_delayed_progress(
1636 _("Updating index flags"),
1639 xsnprintf(label
, sizeof(label
), "clear_ce_flags(0x%08lx,0x%08lx)",
1640 (unsigned long)select_mask
, (unsigned long)clear_mask
);
1641 trace2_region_enter("unpack_trees", label
, the_repository
);
1642 rval
= clear_ce_flags_1(istate
,
1646 select_mask
, clear_mask
,
1648 trace2_region_leave("unpack_trees", label
, the_repository
);
1650 stop_progress(&istate
->progress
);
1655 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1657 static void mark_new_skip_worktree(struct pattern_list
*pl
,
1658 struct index_state
*istate
,
1659 int select_flag
, int skip_wt_flag
,
1665 * 1. Pretend the narrowest worktree: only unmerged entries
1668 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1669 struct cache_entry
*ce
= istate
->cache
[i
];
1671 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1674 if (!ce_stage(ce
) && !(ce
->ce_flags
& CE_CONFLICTED
))
1675 ce
->ce_flags
|= skip_wt_flag
;
1677 ce
->ce_flags
&= ~skip_wt_flag
;
1681 * 2. Widen worktree according to sparse-checkout file.
1682 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1684 clear_ce_flags(istate
, select_flag
, skip_wt_flag
, pl
, show_progress
);
1687 static void populate_from_existing_patterns(struct unpack_trees_options
*o
,
1688 struct pattern_list
*pl
)
1690 if (get_sparse_checkout_patterns(pl
) < 0)
1691 o
->skip_sparse_checkout
= 1;
1697 static int verify_absent(const struct cache_entry
*,
1698 enum unpack_trees_error_types
,
1699 struct unpack_trees_options
*);
1701 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1702 * resulting index, -2 on failure to reflect the changes to the work tree.
1704 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1706 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1708 struct repository
*repo
= the_repository
;
1710 static struct cache_entry
*dfc
;
1711 struct pattern_list pl
;
1712 int free_pattern_list
= 0;
1713 struct dir_struct dir
= DIR_INIT
;
1715 if (o
->reset
== UNPACK_RESET_INVALID
)
1716 BUG("o->reset had a value of 1; should be UNPACK_TREES_*_UNTRACKED");
1718 if (len
> MAX_UNPACK_TREES
)
1719 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1721 BUG("o->dir is for internal use only");
1723 trace_performance_enter();
1724 trace2_region_enter("unpack_trees", "unpack_trees", the_repository
);
1726 prepare_repo_settings(repo
);
1727 if (repo
->settings
.command_requires_full_index
) {
1728 ensure_full_index(o
->src_index
);
1729 ensure_full_index(o
->dst_index
);
1732 if (o
->reset
== UNPACK_RESET_OVERWRITE_UNTRACKED
&&
1733 o
->preserve_ignored
)
1734 BUG("UNPACK_RESET_OVERWRITE_UNTRACKED incompatible with preserved ignored files");
1736 if (!o
->preserve_ignored
) {
1738 o
->dir
->flags
|= DIR_SHOW_IGNORED
;
1739 setup_standard_excludes(o
->dir
);
1742 if (!core_apply_sparse_checkout
|| !o
->update
)
1743 o
->skip_sparse_checkout
= 1;
1744 if (!o
->skip_sparse_checkout
&& !o
->pl
) {
1745 memset(&pl
, 0, sizeof(pl
));
1746 free_pattern_list
= 1;
1747 populate_from_existing_patterns(o
, &pl
);
1750 memset(&o
->result
, 0, sizeof(o
->result
));
1751 o
->result
.initialized
= 1;
1752 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1753 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1754 o
->result
.version
= o
->src_index
->version
;
1755 if (!o
->src_index
->split_index
) {
1756 o
->result
.split_index
= NULL
;
1757 } else if (o
->src_index
== o
->dst_index
) {
1759 * o->dst_index (and thus o->src_index) will be discarded
1760 * and overwritten with o->result at the end of this function,
1761 * so just use src_index's split_index to avoid having to
1764 o
->result
.split_index
= o
->src_index
->split_index
;
1765 o
->result
.split_index
->refcount
++;
1767 o
->result
.split_index
= init_split_index(&o
->result
);
1769 oidcpy(&o
->result
.oid
, &o
->src_index
->oid
);
1770 o
->merge_size
= len
;
1771 mark_all_ce_unused(o
->src_index
);
1773 o
->result
.fsmonitor_last_update
=
1774 xstrdup_or_null(o
->src_index
->fsmonitor_last_update
);
1777 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1779 if (!o
->skip_sparse_checkout
)
1780 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1781 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1784 dfc
= xcalloc(1, cache_entry_size(0));
1785 o
->df_conflict_entry
= dfc
;
1788 const char *prefix
= o
->prefix
? o
->prefix
: "";
1789 struct traverse_info info
;
1791 setup_traverse_info(&info
, prefix
);
1792 info
.fn
= unpack_callback
;
1794 info
.show_all_errors
= o
->show_all_errors
;
1795 info
.pathspec
= o
->pathspec
;
1801 * Unpack existing index entries that sort before the
1802 * prefix the tree is spliced into. Note that o->merge
1803 * is always true in this case.
1806 struct cache_entry
*ce
= next_cache_entry(o
, &hint
);
1809 if (ce_in_traverse_path(ce
, &info
))
1811 if (unpack_index_entry(ce
, o
) < 0)
1816 trace_performance_enter();
1817 trace2_region_enter("unpack_trees", "traverse_trees", the_repository
);
1818 ret
= traverse_trees(o
->src_index
, len
, t
, &info
);
1819 trace2_region_leave("unpack_trees", "traverse_trees", the_repository
);
1820 trace_performance_leave("traverse_trees");
1825 /* Any left-over entries in the index? */
1829 struct cache_entry
*ce
= next_cache_entry(o
, &hint
);
1832 if (unpack_index_entry(ce
, o
) < 0)
1836 mark_all_ce_unused(o
->src_index
);
1838 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1839 ret
= unpack_failed(o
, "Merge requires file-level merging");
1843 if (!o
->skip_sparse_checkout
) {
1845 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1846 * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1847 * so apply_sparse_checkout() won't attempt to remove it from worktree
1849 mark_new_skip_worktree(o
->pl
, &o
->result
,
1850 CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
,
1854 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1855 struct cache_entry
*ce
= o
->result
.cache
[i
];
1858 * Entries marked with CE_ADDED in merged_entry() do not have
1859 * verify_absent() check (the check is effectively disabled
1860 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1862 * Do the real check now because we have had
1863 * correct CE_NEW_SKIP_WORKTREE
1865 if (ce
->ce_flags
& CE_ADDED
&&
1866 verify_absent(ce
, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
, o
))
1869 if (apply_sparse_checkout(&o
->result
, ce
, o
))
1874 * Inability to sparsify or de-sparsify individual
1875 * paths is not an error, but just a warning.
1877 if (o
->show_all_errors
)
1878 display_warning_msgs(o
);
1883 ret
= check_updates(o
, &o
->result
) ? (-2) : 0;
1885 move_index_extensions(&o
->result
, o
->src_index
);
1887 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
1888 cache_tree_verify(the_repository
, &o
->result
);
1889 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1890 cache_tree_update(&o
->result
,
1895 o
->result
.updated_workdir
= 1;
1896 discard_index(o
->dst_index
);
1897 *o
->dst_index
= o
->result
;
1899 discard_index(&o
->result
);
1901 o
->src_index
= NULL
;
1904 if (free_pattern_list
)
1905 clear_pattern_list(&pl
);
1910 trace2_region_leave("unpack_trees", "unpack_trees", the_repository
);
1911 trace_performance_leave("unpack_trees");
1915 if (o
->show_all_errors
)
1916 display_error_msgs(o
);
1917 mark_all_ce_unused(o
->src_index
);
1918 ret
= unpack_failed(o
, NULL
);
1919 if (o
->exiting_early
)
1925 * Update SKIP_WORKTREE bits according to sparsity patterns, and update
1926 * working directory to match.
1928 * CE_NEW_SKIP_WORKTREE is used internally.
1930 enum update_sparsity_result
update_sparsity(struct unpack_trees_options
*o
)
1932 enum update_sparsity_result ret
= UPDATE_SPARSITY_SUCCESS
;
1933 struct pattern_list pl
;
1935 unsigned old_show_all_errors
;
1936 int free_pattern_list
= 0;
1938 old_show_all_errors
= o
->show_all_errors
;
1939 o
->show_all_errors
= 1;
1942 if (!o
->update
|| o
->index_only
|| o
->skip_sparse_checkout
)
1943 BUG("update_sparsity() is for reflecting sparsity patterns in working directory");
1944 if (o
->src_index
!= o
->dst_index
|| o
->fn
)
1945 BUG("update_sparsity() called wrong");
1947 trace_performance_enter();
1949 /* If we weren't given patterns, use the recorded ones */
1951 memset(&pl
, 0, sizeof(pl
));
1952 free_pattern_list
= 1;
1953 populate_from_existing_patterns(o
, &pl
);
1954 if (o
->skip_sparse_checkout
)
1955 goto skip_sparse_checkout
;
1958 /* Set NEW_SKIP_WORKTREE on existing entries. */
1959 mark_all_ce_unused(o
->src_index
);
1960 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1961 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1963 /* Then loop over entries and update/remove as needed */
1964 ret
= UPDATE_SPARSITY_SUCCESS
;
1965 for (i
= 0; i
< o
->src_index
->cache_nr
; i
++) {
1966 struct cache_entry
*ce
= o
->src_index
->cache
[i
];
1970 /* -1 because for loop will increment by 1 */
1971 i
+= warn_conflicted_path(o
->src_index
, i
, o
) - 1;
1972 ret
= UPDATE_SPARSITY_WARNINGS
;
1976 if (apply_sparse_checkout(o
->src_index
, ce
, o
))
1977 ret
= UPDATE_SPARSITY_WARNINGS
;
1980 skip_sparse_checkout
:
1981 if (check_updates(o
, o
->src_index
))
1982 ret
= UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES
;
1984 display_warning_msgs(o
);
1985 o
->show_all_errors
= old_show_all_errors
;
1986 if (free_pattern_list
)
1987 clear_pattern_list(&pl
);
1988 trace_performance_leave("update_sparsity");
1992 /* Here come the merge functions */
1994 static int reject_merge(const struct cache_entry
*ce
,
1995 struct unpack_trees_options
*o
)
1997 return add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
2000 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
2006 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
2008 return a
->ce_mode
== b
->ce_mode
&&
2009 oideq(&a
->oid
, &b
->oid
);
2014 * When a CE gets turned into an unmerged entry, we
2015 * want it to be up-to-date
2017 static int verify_uptodate_1(const struct cache_entry
*ce
,
2018 struct unpack_trees_options
*o
,
2019 enum unpack_trees_error_types error_type
)
2027 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
2028 * if this entry is truly up-to-date because this file may be
2031 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
2032 ; /* keep checking */
2033 else if (o
->reset
|| ce_uptodate(ce
))
2036 if (!lstat(ce
->name
, &st
)) {
2037 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
2038 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
2040 if (submodule_from_ce(ce
)) {
2041 int r
= check_submodule_move_head(ce
,
2042 "HEAD", oid_to_hex(&ce
->oid
), o
);
2044 return add_rejected_path(o
, error_type
, ce
->name
);
2051 * Historic default policy was to allow submodule to be out
2052 * of sync wrt the superproject index. If the submodule was
2053 * not considered interesting above, we don't care here.
2055 if (S_ISGITLINK(ce
->ce_mode
))
2060 if (errno
== ENOENT
)
2062 return add_rejected_path(o
, error_type
, ce
->name
);
2065 int verify_uptodate(const struct cache_entry
*ce
,
2066 struct unpack_trees_options
*o
)
2068 if (!o
->skip_sparse_checkout
&&
2069 (ce
->ce_flags
& CE_SKIP_WORKTREE
) &&
2070 (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
2072 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
2075 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
2076 struct unpack_trees_options
*o
)
2078 return verify_uptodate_1(ce
, o
, WARNING_SPARSE_NOT_UPTODATE_FILE
);
2082 * TODO: We should actually invalidate o->result, not src_index [1].
2083 * But since cache tree and untracked cache both are not copied to
2084 * o->result until unpacking is complete, we invalidate them on
2085 * src_index instead with the assumption that they will be copied to
2086 * dst_index at the end.
2088 * [1] src_index->cache_tree is also used in unpack_callback() so if
2089 * we invalidate o->result, we need to update it to use
2090 * o->result.cache_tree as well.
2092 static void invalidate_ce_path(const struct cache_entry
*ce
,
2093 struct unpack_trees_options
*o
)
2097 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
2098 untracked_cache_invalidate_path(o
->src_index
, ce
->name
, 1);
2102 * Check that checking out ce->sha1 in subdir ce->name is not
2103 * going to overwrite any working files.
2105 static int verify_clean_submodule(const char *old_sha1
,
2106 const struct cache_entry
*ce
,
2107 struct unpack_trees_options
*o
)
2109 if (!submodule_from_ce(ce
))
2112 return check_submodule_move_head(ce
, old_sha1
,
2113 oid_to_hex(&ce
->oid
), o
);
2116 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
2117 struct unpack_trees_options
*o
)
2120 * we are about to extract "ce->name"; we would not want to lose
2121 * anything in the existing directory there.
2125 struct dir_struct d
;
2129 if (S_ISGITLINK(ce
->ce_mode
)) {
2130 struct object_id oid
;
2131 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", &oid
);
2133 * If we are not going to update the submodule, then
2136 if (!sub_head
&& oideq(&oid
, &ce
->oid
))
2138 return verify_clean_submodule(sub_head
? NULL
: oid_to_hex(&oid
),
2143 * First let's make sure we do not have a local modification
2144 * in that directory.
2146 namelen
= ce_namelen(ce
);
2147 for (i
= locate_in_src_index(ce
, o
);
2148 i
< o
->src_index
->cache_nr
;
2150 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
2151 int len
= ce_namelen(ce2
);
2152 if (len
< namelen
||
2153 strncmp(ce
->name
, ce2
->name
, namelen
) ||
2154 ce2
->name
[namelen
] != '/')
2157 * ce2->name is an entry in the subdirectory to be
2160 if (!ce_stage(ce2
)) {
2161 if (verify_uptodate(ce2
, o
))
2163 add_entry(o
, ce2
, CE_REMOVE
, 0);
2164 invalidate_ce_path(ce
, o
);
2165 mark_ce_used(ce2
, o
);
2170 /* Do not lose a locally present file that is not ignored. */
2171 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
2173 memset(&d
, 0, sizeof(d
));
2175 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
2176 i
= read_directory(&d
, o
->src_index
, pathbuf
, namelen
+1, NULL
);
2180 return add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
2182 /* Do not lose startup_info->original_cwd */
2183 if (startup_info
->original_cwd
&&
2184 !strcmp(startup_info
->original_cwd
, ce
->name
))
2185 return add_rejected_path(o
, ERROR_CWD_IN_THE_WAY
, ce
->name
);
2191 * This gets called when there was no index entry for the tree entry 'dst',
2192 * but we found a file in the working tree that 'lstat()' said was fine,
2193 * and we're on a case-insensitive filesystem.
2195 * See if we can find a case-insensitive match in the index that also
2196 * matches the stat information, and assume it's that other file!
2198 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
2200 const struct cache_entry
*src
;
2202 src
= index_file_exists(o
->src_index
, name
, len
, 1);
2203 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
2206 enum absent_checking_type
{
2208 ABSENT_ANY_DIRECTORY
2211 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
2212 const struct cache_entry
*ce
, struct stat
*st
,
2213 enum unpack_trees_error_types error_type
,
2214 enum absent_checking_type absent_type
,
2215 struct unpack_trees_options
*o
)
2217 const struct cache_entry
*result
;
2220 * It may be that the 'lstat()' succeeded even though
2221 * target 'ce' was absent, because there is an old
2222 * entry that is different only in case..
2224 * Ignore that lstat() if it matches.
2226 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
2230 is_excluded(o
->dir
, o
->src_index
, name
, &dtype
))
2232 * ce->name is explicitly excluded, so it is Ok to
2236 if (S_ISDIR(st
->st_mode
)) {
2238 * We are checking out path "foo" and
2239 * found "foo/." in the working tree.
2240 * This is tricky -- if we have modified
2241 * files that are in "foo/" we would lose
2244 if (verify_clean_subdirectory(ce
, o
) < 0)
2249 /* If we only care about directories, then we can remove */
2250 if (absent_type
== ABSENT_ANY_DIRECTORY
)
2254 * The previous round may already have decided to
2255 * delete this path, which is in a subdirectory that
2256 * is being replaced with a blob.
2258 result
= index_file_exists(&o
->result
, name
, len
, 0);
2260 if (result
->ce_flags
& CE_REMOVE
)
2264 return add_rejected_path(o
, error_type
, name
);
2268 * We do not want to remove or overwrite a working tree file that
2269 * is not tracked, unless it is ignored.
2271 static int verify_absent_1(const struct cache_entry
*ce
,
2272 enum unpack_trees_error_types error_type
,
2273 enum absent_checking_type absent_type
,
2274 struct unpack_trees_options
*o
)
2279 if (o
->index_only
|| !o
->update
)
2282 if (o
->reset
== UNPACK_RESET_OVERWRITE_UNTRACKED
) {
2283 /* Avoid nuking startup_info->original_cwd... */
2284 if (startup_info
->original_cwd
&&
2285 !strcmp(startup_info
->original_cwd
, ce
->name
))
2286 return add_rejected_path(o
, ERROR_CWD_IN_THE_WAY
,
2288 /* ...but nuke anything else. */
2292 len
= check_leading_path(ce
->name
, ce_namelen(ce
), 0);
2299 path
= xmemdupz(ce
->name
, len
);
2300 if (lstat(path
, &st
))
2301 ret
= error_errno("cannot stat '%s'", path
);
2303 if (submodule_from_ce(ce
))
2304 ret
= check_submodule_move_head(ce
,
2305 oid_to_hex(&ce
->oid
),
2308 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
2314 } else if (lstat(ce
->name
, &st
)) {
2315 if (errno
!= ENOENT
)
2316 return error_errno("cannot stat '%s'", ce
->name
);
2319 if (submodule_from_ce(ce
))
2320 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
2323 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
2324 ce_to_dtype(ce
), ce
, &st
,
2325 error_type
, absent_type
, o
);
2329 static int verify_absent(const struct cache_entry
*ce
,
2330 enum unpack_trees_error_types error_type
,
2331 struct unpack_trees_options
*o
)
2333 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
2335 return verify_absent_1(ce
, error_type
, COMPLETELY_ABSENT
, o
);
2338 static int verify_absent_if_directory(const struct cache_entry
*ce
,
2339 enum unpack_trees_error_types error_type
,
2340 struct unpack_trees_options
*o
)
2342 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
2344 return verify_absent_1(ce
, error_type
, ABSENT_ANY_DIRECTORY
, o
);
2347 static int verify_absent_sparse(const struct cache_entry
*ce
,
2348 enum unpack_trees_error_types error_type
,
2349 struct unpack_trees_options
*o
)
2351 return verify_absent_1(ce
, error_type
, COMPLETELY_ABSENT
, o
);
2354 static int merged_entry(const struct cache_entry
*ce
,
2355 const struct cache_entry
*old
,
2356 struct unpack_trees_options
*o
)
2358 int update
= CE_UPDATE
;
2359 struct cache_entry
*merge
= dup_cache_entry(ce
, &o
->result
);
2363 * New index entries. In sparse checkout, the following
2364 * verify_absent() will be delayed until after
2365 * traverse_trees() finishes in unpack_trees(), then:
2367 * - CE_NEW_SKIP_WORKTREE will be computed correctly
2368 * - verify_absent() be called again, this time with
2369 * correct CE_NEW_SKIP_WORKTREE
2371 * verify_absent() call here does nothing in sparse
2372 * checkout (i.e. o->skip_sparse_checkout == 0)
2375 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
2377 if (verify_absent(merge
,
2378 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
2379 discard_cache_entry(merge
);
2382 invalidate_ce_path(merge
, o
);
2384 if (submodule_from_ce(ce
) && file_exists(ce
->name
)) {
2385 int ret
= check_submodule_move_head(ce
, NULL
,
2386 oid_to_hex(&ce
->oid
),
2392 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
2394 * See if we can re-use the old CE directly?
2395 * That way we get the uptodate stat info.
2397 * This also removes the UPDATE flag on a match; otherwise
2398 * we will end up overwriting local changes in the work tree.
2400 if (same(old
, merge
)) {
2401 copy_cache_entry(merge
, old
);
2404 if (verify_uptodate(old
, o
)) {
2405 discard_cache_entry(merge
);
2408 /* Migrate old flags over */
2409 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
2410 invalidate_ce_path(old
, o
);
2413 if (submodule_from_ce(ce
) && file_exists(ce
->name
)) {
2414 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
2415 oid_to_hex(&ce
->oid
),
2422 * Previously unmerged entry left as an existence
2423 * marker by read_index_unmerged();
2425 if (verify_absent_if_directory(merge
,
2426 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
2427 discard_cache_entry(merge
);
2431 invalidate_ce_path(old
, o
);
2434 if (do_add_entry(o
, merge
, update
, CE_STAGEMASK
) < 0)
2439 static int deleted_entry(const struct cache_entry
*ce
,
2440 const struct cache_entry
*old
,
2441 struct unpack_trees_options
*o
)
2443 /* Did it exist in the index? */
2445 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2448 } else if (verify_absent_if_directory(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
)) {
2452 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
2454 add_entry(o
, ce
, CE_REMOVE
, 0);
2455 invalidate_ce_path(ce
, o
);
2459 static int keep_entry(const struct cache_entry
*ce
,
2460 struct unpack_trees_options
*o
)
2462 add_entry(o
, ce
, 0, 0);
2464 invalidate_ce_path(ce
, o
);
2469 static void show_stage_entry(FILE *o
,
2470 const char *label
, const struct cache_entry
*ce
)
2473 fprintf(o
, "%s (missing)\n", label
);
2475 fprintf(o
, "%s%06o %s %d\t%s\n",
2478 oid_to_hex(&ce
->oid
),
2484 int threeway_merge(const struct cache_entry
* const *stages
,
2485 struct unpack_trees_options
*o
)
2487 const struct cache_entry
*index
;
2488 const struct cache_entry
*head
;
2489 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
2492 int remote_match
= 0;
2494 int df_conflict_head
= 0;
2495 int df_conflict_remote
= 0;
2497 int any_anc_missing
= 0;
2498 int no_anc_exists
= 1;
2501 for (i
= 1; i
< o
->head_idx
; i
++) {
2502 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
2503 any_anc_missing
= 1;
2509 head
= stages
[o
->head_idx
];
2511 if (head
== o
->df_conflict_entry
) {
2512 df_conflict_head
= 1;
2516 if (remote
== o
->df_conflict_entry
) {
2517 df_conflict_remote
= 1;
2522 * First, if there's a #16 situation, note that to prevent #13
2525 if (!same(remote
, head
)) {
2526 for (i
= 1; i
< o
->head_idx
; i
++) {
2527 if (same(stages
[i
], head
)) {
2530 if (same(stages
[i
], remote
)) {
2537 * We start with cases where the index is allowed to match
2538 * something other than the head: #14(ALT) and #2ALT, where it
2539 * is permitted to match the result instead.
2541 /* #14, #14ALT, #2ALT */
2542 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
2543 if (index
&& !same(index
, remote
) && !same(index
, head
))
2544 return reject_merge(index
, o
);
2545 return merged_entry(remote
, index
, o
);
2548 * If we have an entry in the index cache, then we want to
2549 * make sure that it matches head.
2551 if (index
&& !same(index
, head
))
2552 return reject_merge(index
, o
);
2556 if (same(head
, remote
))
2557 return merged_entry(head
, index
, o
);
2559 if (!df_conflict_remote
&& remote_match
&& !head_match
)
2560 return merged_entry(head
, index
, o
);
2564 if (!head
&& !remote
&& any_anc_missing
)
2568 * Under the "aggressive" rule, we resolve mostly trivial
2569 * cases that we historically had git-merge-one-file resolve.
2571 if (o
->aggressive
) {
2572 int head_deleted
= !head
;
2573 int remote_deleted
= !remote
;
2574 const struct cache_entry
*ce
= NULL
;
2583 for (i
= 1; i
< o
->head_idx
; i
++) {
2584 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2593 * Deleted in one and unchanged in the other.
2595 if ((head_deleted
&& remote_deleted
) ||
2596 (head_deleted
&& remote
&& remote_match
) ||
2597 (remote_deleted
&& head
&& head_match
)) {
2599 return deleted_entry(index
, index
, o
);
2600 if (ce
&& !head_deleted
) {
2601 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2607 * Added in both, identically.
2609 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
2610 return merged_entry(head
, index
, o
);
2614 /* Below are "no merge" cases, which require that the index be
2615 * up-to-date to avoid the files getting overwritten with
2616 * conflict resolution files.
2619 if (verify_uptodate(index
, o
))
2623 o
->nontrivial_merge
= 1;
2625 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2627 if (!head_match
|| !remote_match
) {
2628 for (i
= 1; i
< o
->head_idx
; i
++) {
2629 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2630 keep_entry(stages
[i
], o
);
2638 fprintf(stderr
, "read-tree: warning #16 detected\n");
2639 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2640 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2643 if (head
) { count
+= keep_entry(head
, o
); }
2644 if (remote
) { count
+= keep_entry(remote
, o
); }
2651 * The rule is to "carry forward" what is in the index without losing
2652 * information across a "fast-forward", favoring a successful merge
2653 * over a merge failure when it makes sense. For details of the
2654 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2657 int twoway_merge(const struct cache_entry
* const *src
,
2658 struct unpack_trees_options
*o
)
2660 const struct cache_entry
*current
= src
[0];
2661 const struct cache_entry
*oldtree
= src
[1];
2662 const struct cache_entry
*newtree
= src
[2];
2664 if (o
->merge_size
!= 2)
2665 return error("Cannot do a twoway merge of %d trees",
2668 if (oldtree
== o
->df_conflict_entry
)
2670 if (newtree
== o
->df_conflict_entry
)
2674 if (current
->ce_flags
& CE_CONFLICTED
) {
2675 if (same(oldtree
, newtree
) || o
->reset
) {
2677 return deleted_entry(current
, current
, o
);
2679 return merged_entry(newtree
, current
, o
);
2681 return reject_merge(current
, o
);
2682 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2683 (!oldtree
&& newtree
&&
2684 same(current
, newtree
)) || /* 6 and 7 */
2685 (oldtree
&& newtree
&&
2686 same(oldtree
, newtree
)) || /* 14 and 15 */
2687 (oldtree
&& newtree
&&
2688 !same(oldtree
, newtree
) && /* 18 and 19 */
2689 same(current
, newtree
))) {
2690 return keep_entry(current
, o
);
2691 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2693 return deleted_entry(oldtree
, current
, o
);
2694 } else if (oldtree
&& newtree
&&
2695 same(current
, oldtree
) && !same(current
, newtree
)) {
2697 return merged_entry(newtree
, current
, o
);
2698 } else if (current
&& !oldtree
&& newtree
&&
2699 S_ISSPARSEDIR(current
->ce_mode
) != S_ISSPARSEDIR(newtree
->ce_mode
) &&
2700 ce_stage(current
) == 0) {
2702 * This case is a directory/file conflict across the sparse-index
2703 * boundary. When we are changing from one path to another via
2704 * 'git checkout', then we want to replace one entry with another
2705 * via merged_entry(). If there are staged changes, then we should
2706 * reject the merge instead.
2708 return merged_entry(newtree
, current
, o
);
2710 return reject_merge(current
, o
);
2713 if (oldtree
&& !o
->initial_checkout
) {
2715 * deletion of the path was staged;
2717 if (same(oldtree
, newtree
))
2719 return reject_merge(oldtree
, o
);
2721 return merged_entry(newtree
, current
, o
);
2723 return deleted_entry(oldtree
, current
, o
);
2729 * Keep the index entries at stage0, collapse stage1 but make sure
2730 * stage0 does not have anything there.
2732 int bind_merge(const struct cache_entry
* const *src
,
2733 struct unpack_trees_options
*o
)
2735 const struct cache_entry
*old
= src
[0];
2736 const struct cache_entry
*a
= src
[1];
2738 if (o
->merge_size
!= 1)
2739 return error("Cannot do a bind merge of %d trees",
2742 return o
->quiet
? -1 :
2743 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2744 super_prefixed(a
->name
),
2745 super_prefixed(old
->name
));
2747 return keep_entry(old
, o
);
2749 return merged_entry(a
, NULL
, o
);
2756 * - take the stat information from stage0, take the data from stage1
2758 int oneway_merge(const struct cache_entry
* const *src
,
2759 struct unpack_trees_options
*o
)
2761 const struct cache_entry
*old
= src
[0];
2762 const struct cache_entry
*a
= src
[1];
2764 if (o
->merge_size
!= 1)
2765 return error("Cannot do a oneway merge of %d trees",
2768 if (!a
|| a
== o
->df_conflict_entry
)
2769 return deleted_entry(old
, old
, o
);
2771 if (old
&& same(old
, a
)) {
2773 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
) &&
2774 !(old
->ce_flags
& CE_FSMONITOR_VALID
)) {
2776 if (lstat(old
->name
, &st
) ||
2777 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2778 update
|= CE_UPDATE
;
2780 if (o
->update
&& S_ISGITLINK(old
->ce_mode
) &&
2781 should_update_submodules() && !verify_uptodate(old
, o
))
2782 update
|= CE_UPDATE
;
2783 add_entry(o
, old
, update
, CE_STAGEMASK
);
2786 return merged_entry(a
, old
, o
);
2790 * Merge worktree and untracked entries in a stash entry.
2792 * Ignore all index entries. Collapse remaining trees but make sure that they
2793 * don't have any conflicting files.
2795 int stash_worktree_untracked_merge(const struct cache_entry
* const *src
,
2796 struct unpack_trees_options
*o
)
2798 const struct cache_entry
*worktree
= src
[1];
2799 const struct cache_entry
*untracked
= src
[2];
2801 if (o
->merge_size
!= 2)
2802 BUG("invalid merge_size: %d", o
->merge_size
);
2804 if (worktree
&& untracked
)
2805 return error(_("worktree and untracked commit have duplicate entries: %s"),
2806 super_prefixed(worktree
->name
));
2808 return merged_entry(worktree
? worktree
: untracked
, NULL
, o
);