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_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
40 "Untracked working tree file '%s' would be overwritten by merge.",
42 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
43 "Untracked working tree file '%s' would be removed by merge.",
45 /* ERROR_BIND_OVERLAP */
46 "Entry '%s' overlaps with '%s'. Cannot bind.",
48 /* ERROR_WOULD_LOSE_SUBMODULE */
49 "Submodule '%s' cannot checkout new HEAD.",
51 /* NB_UNPACK_TREES_ERROR_TYPES; just a meta value */
54 /* WARNING_SPARSE_NOT_UPTODATE_FILE */
55 "Path '%s' not uptodate; will not remove from working tree.",
57 /* WARNING_SPARSE_UNMERGED_FILE */
58 "Path '%s' unmerged; will not remove from working tree.",
60 /* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */
61 "Path '%s' already present; will not overwrite with sparse update.",
64 #define ERRORMSG(o,type) \
65 ( ((o) && (o)->msgs[(type)]) \
66 ? ((o)->msgs[(type)]) \
67 : (unpack_plumbing_errors[(type)]) )
69 static const char *super_prefixed(const char *path
)
72 * It is necessary and sufficient to have two static buffers
73 * here, as the return value of this function is fed to
74 * error() using the unpack_*_errors[] templates we see above.
76 static struct strbuf buf
[2] = {STRBUF_INIT
, STRBUF_INIT
};
77 static int super_prefix_len
= -1;
78 static unsigned idx
= ARRAY_SIZE(buf
) - 1;
80 if (super_prefix_len
< 0) {
81 const char *super_prefix
= get_super_prefix();
86 for (i
= 0; i
< ARRAY_SIZE(buf
); i
++)
87 strbuf_addstr(&buf
[i
], super_prefix
);
88 super_prefix_len
= buf
[0].len
;
92 if (!super_prefix_len
)
95 if (++idx
>= ARRAY_SIZE(buf
))
98 strbuf_setlen(&buf
[idx
], super_prefix_len
);
99 strbuf_addstr(&buf
[idx
], path
);
104 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
108 const char **msgs
= opts
->msgs
;
111 strvec_init(&opts
->msgs_to_free
);
113 if (!strcmp(cmd
, "checkout"))
114 msg
= advice_commit_before_merge
115 ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
116 "Please commit your changes or stash them before you switch branches.")
117 : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
118 else if (!strcmp(cmd
, "merge"))
119 msg
= advice_commit_before_merge
120 ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
121 "Please commit your changes or stash them before you merge.")
122 : _("Your local changes to the following files would be overwritten by merge:\n%%s");
124 msg
= advice_commit_before_merge
125 ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
126 "Please commit your changes or stash them before you %s.")
127 : _("Your local changes to the following files would be overwritten by %s:\n%%s");
128 msgs
[ERROR_WOULD_OVERWRITE
] = msgs
[ERROR_NOT_UPTODATE_FILE
] =
129 strvec_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
131 msgs
[ERROR_NOT_UPTODATE_DIR
] =
132 _("Updating the following directories would lose untracked files in them:\n%s");
134 if (!strcmp(cmd
, "checkout"))
135 msg
= advice_commit_before_merge
136 ? _("The following untracked working tree files would be removed by checkout:\n%%s"
137 "Please move or remove them before you switch branches.")
138 : _("The following untracked working tree files would be removed by checkout:\n%%s");
139 else if (!strcmp(cmd
, "merge"))
140 msg
= advice_commit_before_merge
141 ? _("The following untracked working tree files would be removed by merge:\n%%s"
142 "Please move or remove them before you merge.")
143 : _("The following untracked working tree files would be removed by merge:\n%%s");
145 msg
= advice_commit_before_merge
146 ? _("The following untracked working tree files would be removed by %s:\n%%s"
147 "Please move or remove them before you %s.")
148 : _("The following untracked working tree files would be removed by %s:\n%%s");
149 msgs
[ERROR_WOULD_LOSE_UNTRACKED_REMOVED
] =
150 strvec_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
152 if (!strcmp(cmd
, "checkout"))
153 msg
= advice_commit_before_merge
154 ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
155 "Please move or remove them before you switch branches.")
156 : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
157 else if (!strcmp(cmd
, "merge"))
158 msg
= advice_commit_before_merge
159 ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
160 "Please move or remove them before you merge.")
161 : _("The following untracked working tree files would be overwritten by merge:\n%%s");
163 msg
= advice_commit_before_merge
164 ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
165 "Please move or remove them before you %s.")
166 : _("The following untracked working tree files would be overwritten by %s:\n%%s");
167 msgs
[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
] =
168 strvec_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
171 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
172 * cannot easily display it as a list.
174 msgs
[ERROR_BIND_OVERLAP
] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
176 msgs
[ERROR_WOULD_LOSE_SUBMODULE
] =
177 _("Cannot update submodule:\n%s");
179 msgs
[WARNING_SPARSE_NOT_UPTODATE_FILE
] =
180 _("The following paths are not up to date and were left despite sparse patterns:\n%s");
181 msgs
[WARNING_SPARSE_UNMERGED_FILE
] =
182 _("The following paths are unmerged and were left despite sparse patterns:\n%s");
183 msgs
[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
] =
184 _("The following paths were already present and thus not updated despite sparse patterns:\n%s");
186 opts
->show_all_errors
= 1;
187 /* rejected paths may not have a static buffer */
188 for (i
= 0; i
< ARRAY_SIZE(opts
->unpack_rejects
); i
++)
189 opts
->unpack_rejects
[i
].strdup_strings
= 1;
192 void clear_unpack_trees_porcelain(struct unpack_trees_options
*opts
)
194 strvec_clear(&opts
->msgs_to_free
);
195 memset(opts
->msgs
, 0, sizeof(opts
->msgs
));
198 static int do_add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
199 unsigned int set
, unsigned int clear
)
206 ce
->ce_flags
= (ce
->ce_flags
& ~clear
) | set
;
207 return add_index_entry(&o
->result
, ce
,
208 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
211 static void add_entry(struct unpack_trees_options
*o
,
212 const struct cache_entry
*ce
,
213 unsigned int set
, unsigned int clear
)
215 do_add_entry(o
, dup_cache_entry(ce
, &o
->result
), set
, clear
);
219 * add error messages on path <path>
220 * corresponding to the type <e> with the message <msg>
221 * indicating if it should be display in porcelain or not
223 static int add_rejected_path(struct unpack_trees_options
*o
,
224 enum unpack_trees_error_types e
,
230 if (!o
->show_all_errors
)
231 return error(ERRORMSG(o
, e
), super_prefixed(path
));
234 * Otherwise, insert in a list for future display by
235 * display_(error|warning)_msgs()
237 string_list_append(&o
->unpack_rejects
[e
], path
);
242 * display all the error messages stored in a nice way
244 static void display_error_msgs(struct unpack_trees_options
*o
)
247 unsigned error_displayed
= 0;
248 for (e
= 0; e
< NB_UNPACK_TREES_ERROR_TYPES
; e
++) {
249 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
251 if (rejects
->nr
> 0) {
253 struct strbuf path
= STRBUF_INIT
;
256 for (i
= 0; i
< rejects
->nr
; i
++)
257 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
258 error(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
259 strbuf_release(&path
);
261 string_list_clear(rejects
, 0);
264 fprintf(stderr
, _("Aborting\n"));
268 * display all the warning messages stored in a nice way
270 static void display_warning_msgs(struct unpack_trees_options
*o
)
273 unsigned warning_displayed
= 0;
274 for (e
= NB_UNPACK_TREES_ERROR_TYPES
+ 1;
275 e
< NB_UNPACK_TREES_WARNING_TYPES
; e
++) {
276 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
278 if (rejects
->nr
> 0) {
280 struct strbuf path
= STRBUF_INIT
;
282 warning_displayed
= 1;
283 for (i
= 0; i
< rejects
->nr
; i
++)
284 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
285 warning(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
286 strbuf_release(&path
);
288 string_list_clear(rejects
, 0);
290 if (warning_displayed
)
291 fprintf(stderr
, _("After fixing the above paths, you may want to run `git sparse-checkout reapply`.\n"));
293 static int check_submodule_move_head(const struct cache_entry
*ce
,
296 struct unpack_trees_options
*o
)
298 unsigned flags
= SUBMODULE_MOVE_HEAD_DRY_RUN
;
299 const struct submodule
*sub
= submodule_from_ce(ce
);
305 flags
|= SUBMODULE_MOVE_HEAD_FORCE
;
307 if (submodule_move_head(ce
->name
, old_id
, new_id
, flags
))
308 return add_rejected_path(o
, ERROR_WOULD_LOSE_SUBMODULE
, ce
->name
);
313 * Perform the loading of the repository's gitmodules file. This function is
314 * used by 'check_update()' to perform loading of the gitmodules file in two
315 * different situations:
316 * (1) before removing entries from the working tree if the gitmodules file has
317 * been marked for removal. This situation is specified by 'state' == NULL.
318 * (2) before checking out entries to the working tree if the gitmodules file
319 * has been marked for update. This situation is specified by 'state' != NULL.
321 static void load_gitmodules_file(struct index_state
*index
,
322 struct checkout
*state
)
324 int pos
= index_name_pos(index
, GITMODULES_FILE
, strlen(GITMODULES_FILE
));
327 struct cache_entry
*ce
= index
->cache
[pos
];
328 if (!state
&& ce
->ce_flags
& CE_WT_REMOVE
) {
329 repo_read_gitmodules(the_repository
, 0);
330 } else if (state
&& (ce
->ce_flags
& CE_UPDATE
)) {
331 submodule_free(the_repository
);
332 checkout_entry(ce
, state
, NULL
, NULL
);
333 repo_read_gitmodules(the_repository
, 0);
338 static struct progress
*get_progress(struct unpack_trees_options
*o
,
339 struct index_state
*index
)
341 unsigned cnt
= 0, total
= 0;
343 if (!o
->update
|| !o
->verbose_update
)
346 for (; cnt
< index
->cache_nr
; cnt
++) {
347 const struct cache_entry
*ce
= index
->cache
[cnt
];
348 if (ce
->ce_flags
& (CE_UPDATE
| CE_WT_REMOVE
))
352 return start_delayed_progress(_("Updating files"), total
);
355 static void setup_collided_checkout_detection(struct checkout
*state
,
356 struct index_state
*index
)
361 for (i
= 0; i
< index
->cache_nr
; i
++)
362 index
->cache
[i
]->ce_flags
&= ~CE_MATCHED
;
365 static void report_collided_checkout(struct index_state
*index
)
367 struct string_list list
= STRING_LIST_INIT_NODUP
;
370 for (i
= 0; i
< index
->cache_nr
; i
++) {
371 struct cache_entry
*ce
= index
->cache
[i
];
373 if (!(ce
->ce_flags
& CE_MATCHED
))
376 string_list_append(&list
, ce
->name
);
377 ce
->ce_flags
&= ~CE_MATCHED
;
380 list
.cmp
= fspathcmp
;
381 string_list_sort(&list
);
384 warning(_("the following paths have collided (e.g. case-sensitive paths\n"
385 "on a case-insensitive filesystem) and only one from the same\n"
386 "colliding group is in the working tree:\n"));
388 for (i
= 0; i
< list
.nr
; i
++)
389 fprintf(stderr
, " '%s'\n", list
.items
[i
].string
);
392 string_list_clear(&list
, 0);
395 static int check_updates(struct unpack_trees_options
*o
,
396 struct index_state
*index
)
400 struct progress
*progress
;
401 struct checkout state
= CHECKOUT_INIT
;
402 int i
, pc_workers
, pc_threshold
;
404 trace_performance_enter();
407 state
.refresh_cache
= 1;
408 state
.istate
= index
;
409 clone_checkout_metadata(&state
.meta
, &o
->meta
, NULL
);
411 if (!o
->update
|| o
->dry_run
) {
412 remove_marked_cache_entries(index
, 0);
413 trace_performance_leave("check_updates");
418 setup_collided_checkout_detection(&state
, index
);
420 progress
= get_progress(o
, index
);
422 /* Start with clean cache to avoid using any possibly outdated info. */
423 invalidate_lstat_cache();
425 git_attr_set_direction(GIT_ATTR_CHECKOUT
);
427 if (should_update_submodules())
428 load_gitmodules_file(index
, NULL
);
430 for (i
= 0; i
< index
->cache_nr
; i
++) {
431 const struct cache_entry
*ce
= index
->cache
[i
];
433 if (ce
->ce_flags
& CE_WT_REMOVE
) {
434 display_progress(progress
, ++cnt
);
439 remove_marked_cache_entries(index
, 0);
440 remove_scheduled_dirs();
442 if (should_update_submodules())
443 load_gitmodules_file(index
, &state
);
445 if (has_promisor_remote()) {
447 * Prefetch the objects that are to be checked out in the loop
450 struct oid_array to_fetch
= OID_ARRAY_INIT
;
451 for (i
= 0; i
< index
->cache_nr
; i
++) {
452 struct cache_entry
*ce
= index
->cache
[i
];
454 if (!(ce
->ce_flags
& CE_UPDATE
) ||
455 S_ISGITLINK(ce
->ce_mode
))
457 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
459 OBJECT_INFO_FOR_PREFETCH
))
461 oid_array_append(&to_fetch
, &ce
->oid
);
463 promisor_remote_get_direct(the_repository
,
464 to_fetch
.oid
, to_fetch
.nr
);
465 oid_array_clear(&to_fetch
);
468 get_parallel_checkout_configs(&pc_workers
, &pc_threshold
);
470 enable_delayed_checkout(&state
);
472 init_parallel_checkout();
473 for (i
= 0; i
< index
->cache_nr
; i
++) {
474 struct cache_entry
*ce
= index
->cache
[i
];
476 if (ce
->ce_flags
& CE_UPDATE
) {
477 size_t last_pc_queue_size
= pc_queue_size();
479 if (ce
->ce_flags
& CE_WT_REMOVE
)
480 BUG("both update and delete flags are set on %s",
482 ce
->ce_flags
&= ~CE_UPDATE
;
483 errs
|= checkout_entry(ce
, &state
, NULL
, NULL
);
485 if (last_pc_queue_size
== pc_queue_size())
486 display_progress(progress
, ++cnt
);
490 errs
|= run_parallel_checkout(&state
, pc_workers
, pc_threshold
,
492 stop_progress(&progress
);
493 errs
|= finish_delayed_checkout(&state
, NULL
);
494 git_attr_set_direction(GIT_ATTR_CHECKIN
);
497 report_collided_checkout(index
);
499 trace_performance_leave("check_updates");
503 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
504 struct unpack_trees_options
*o
);
505 static int verify_absent_sparse(const struct cache_entry
*ce
,
506 enum unpack_trees_error_types
,
507 struct unpack_trees_options
*o
);
509 static int apply_sparse_checkout(struct index_state
*istate
,
510 struct cache_entry
*ce
,
511 struct unpack_trees_options
*o
)
513 int was_skip_worktree
= ce_skip_worktree(ce
);
515 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
516 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
518 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
519 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
520 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
521 mark_fsmonitor_invalid(istate
, ce
);
522 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
526 * if (!was_skip_worktree && !ce_skip_worktree()) {
527 * This is perfectly normal. Move on;
532 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
533 * area as a result of ce_skip_worktree() shortcuts in
534 * verify_absent() and verify_uptodate().
535 * Make sure they don't modify worktree if they are already
536 * outside checkout area
538 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
539 ce
->ce_flags
&= ~CE_UPDATE
;
542 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
543 * on to get that file removed from both index and worktree.
544 * If that file is already outside worktree area, don't
547 if (ce
->ce_flags
& CE_REMOVE
)
548 ce
->ce_flags
&= ~CE_WT_REMOVE
;
551 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
553 * If CE_UPDATE is set, verify_uptodate() must be called already
554 * also stat info may have lost after merged_entry() so calling
555 * verify_uptodate() again may fail
557 if (!(ce
->ce_flags
& CE_UPDATE
) &&
558 verify_uptodate_sparse(ce
, o
)) {
559 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
562 ce
->ce_flags
|= CE_WT_REMOVE
;
563 ce
->ce_flags
&= ~CE_UPDATE
;
565 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
566 if (verify_absent_sparse(ce
, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
, o
))
568 ce
->ce_flags
|= CE_UPDATE
;
573 static int warn_conflicted_path(struct index_state
*istate
,
575 struct unpack_trees_options
*o
)
577 char *conflicting_path
= istate
->cache
[i
]->name
;
580 add_rejected_path(o
, WARNING_SPARSE_UNMERGED_FILE
, conflicting_path
);
582 /* Find out how many higher stage entries are at same path */
583 while ((++count
) + i
< istate
->cache_nr
&&
584 !strcmp(conflicting_path
, istate
->cache
[count
+ i
]->name
))
590 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
591 struct unpack_trees_options
*o
)
593 int ret
= o
->fn(src
, o
);
599 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
601 ce
->ce_flags
|= CE_UNPACKED
;
604 * If this is a sparse directory, don't advance cache_bottom.
605 * That will be advanced later using the cache-tree data.
607 if (S_ISSPARSEDIR(ce
->ce_mode
))
610 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
611 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
612 int bottom
= o
->cache_bottom
;
613 while (bottom
< o
->src_index
->cache_nr
&&
614 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
616 o
->cache_bottom
= bottom
;
620 static void mark_all_ce_unused(struct index_state
*index
)
623 for (i
= 0; i
< index
->cache_nr
; i
++)
624 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
627 static int locate_in_src_index(const struct cache_entry
*ce
,
628 struct unpack_trees_options
*o
)
630 struct index_state
*index
= o
->src_index
;
631 int len
= ce_namelen(ce
);
632 int pos
= index_name_pos(index
, ce
->name
, len
);
639 * We call unpack_index_entry() with an unmerged cache entry
640 * only in diff-index, and it wants a single callback. Skip
641 * the other unmerged entry with the same name.
643 static void mark_ce_used_same_name(struct cache_entry
*ce
,
644 struct unpack_trees_options
*o
)
646 struct index_state
*index
= o
->src_index
;
647 int len
= ce_namelen(ce
);
650 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
651 struct cache_entry
*next
= index
->cache
[pos
];
652 if (len
!= ce_namelen(next
) ||
653 memcmp(ce
->name
, next
->name
, len
))
655 mark_ce_used(next
, o
);
659 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
661 const struct index_state
*index
= o
->src_index
;
662 int pos
= o
->cache_bottom
;
664 while (pos
< index
->cache_nr
) {
665 struct cache_entry
*ce
= index
->cache
[pos
];
666 if (!(ce
->ce_flags
& CE_UNPACKED
))
673 static void add_same_unmerged(const struct cache_entry
*ce
,
674 struct unpack_trees_options
*o
)
676 struct index_state
*index
= o
->src_index
;
677 int len
= ce_namelen(ce
);
678 int pos
= index_name_pos(index
, ce
->name
, len
);
681 die("programming error in a caller of mark_ce_used_same_name");
682 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
683 struct cache_entry
*next
= index
->cache
[pos
];
684 if (len
!= ce_namelen(next
) ||
685 memcmp(ce
->name
, next
->name
, len
))
687 add_entry(o
, next
, 0, 0);
688 mark_ce_used(next
, o
);
692 static int unpack_index_entry(struct cache_entry
*ce
,
693 struct unpack_trees_options
*o
)
695 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
702 if (o
->skip_unmerged
) {
703 add_entry(o
, ce
, 0, 0);
707 ret
= call_unpack_fn(src
, o
);
709 mark_ce_used_same_name(ce
, o
);
713 static int find_cache_pos(struct traverse_info
*, const char *p
, size_t len
);
715 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
717 struct unpack_trees_options
*o
= info
->data
;
719 if (o
->diff_index_cached
)
721 o
->cache_bottom
= bottom
;
724 static int switch_cache_bottom(struct traverse_info
*info
)
726 struct unpack_trees_options
*o
= info
->data
;
729 if (o
->diff_index_cached
)
731 ret
= o
->cache_bottom
;
732 pos
= find_cache_pos(info
->prev
, info
->name
, info
->namelen
);
735 o
->cache_bottom
= -2 - pos
;
737 o
->cache_bottom
= o
->src_index
->cache_nr
;
741 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
743 return !is_null_oid(&name_j
->oid
) && !is_null_oid(&name_k
->oid
) && oideq(&name_j
->oid
, &name_k
->oid
);
746 static int all_trees_same_as_cache_tree(int n
, unsigned long dirmask
,
747 struct name_entry
*names
,
748 struct traverse_info
*info
)
750 struct unpack_trees_options
*o
= info
->data
;
753 if (!o
->merge
|| dirmask
!= ((1 << n
) - 1))
756 for (i
= 1; i
< n
; i
++)
757 if (!are_same_oid(names
, names
+ i
))
760 return cache_tree_matches_traversal(o
->src_index
->cache_tree
, names
, info
);
763 static int index_pos_by_traverse_info(struct name_entry
*names
,
764 struct traverse_info
*info
)
766 struct unpack_trees_options
*o
= info
->data
;
767 struct strbuf name
= STRBUF_INIT
;
770 strbuf_make_traverse_path(&name
, info
, names
->path
, names
->pathlen
);
771 strbuf_addch(&name
, '/');
772 pos
= index_name_pos(o
->src_index
, name
.buf
, name
.len
);
774 if (!o
->src_index
->sparse_index
||
775 !(o
->src_index
->cache
[pos
]->ce_flags
& CE_SKIP_WORKTREE
))
776 BUG("This is a directory and should not exist in index");
780 if (pos
>= o
->src_index
->cache_nr
||
781 !starts_with(o
->src_index
->cache
[pos
]->name
, name
.buf
) ||
782 (pos
> 0 && starts_with(o
->src_index
->cache
[pos
-1]->name
, name
.buf
)))
783 BUG("pos %d doesn't point to the first entry of %s in index",
785 strbuf_release(&name
);
790 * Fast path if we detect that all trees are the same as cache-tree at this
791 * path. We'll walk these trees in an iterative loop using cache-tree/index
792 * instead of ODB since we already know what these trees contain.
794 static int traverse_by_cache_tree(int pos
, int nr_entries
, int nr_names
,
795 struct traverse_info
*info
)
797 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
798 struct unpack_trees_options
*o
= info
->data
;
799 struct cache_entry
*tree_ce
= NULL
;
804 BUG("We need cache-tree to do this optimization");
807 * Do what unpack_callback() and unpack_single_entry() normally
808 * do. But we walk all paths in an iterative loop instead.
810 * D/F conflicts and higher stage entries are not a concern
811 * because cache-tree would be invalidated and we would never
812 * get here in the first place.
814 for (i
= 0; i
< nr_entries
; i
++) {
815 int new_ce_len
, len
, rc
;
817 src
[0] = o
->src_index
->cache
[pos
+ i
];
819 len
= ce_namelen(src
[0]);
820 new_ce_len
= cache_entry_size(len
);
822 if (new_ce_len
> ce_len
) {
824 tree_ce
= xrealloc(tree_ce
, new_ce_len
);
825 memset(tree_ce
, 0, new_ce_len
);
828 tree_ce
->ce_flags
= create_ce_flags(0);
830 for (d
= 1; d
<= nr_names
; d
++)
834 tree_ce
->ce_mode
= src
[0]->ce_mode
;
835 tree_ce
->ce_namelen
= len
;
836 oidcpy(&tree_ce
->oid
, &src
[0]->oid
);
837 memcpy(tree_ce
->name
, src
[0]->name
, len
+ 1);
839 rc
= call_unpack_fn((const struct cache_entry
* const *)src
, o
);
845 mark_ce_used(src
[0], o
);
849 printf("Unpacked %d entries from %s to %s using cache-tree\n",
851 o
->src_index
->cache
[pos
]->name
,
852 o
->src_index
->cache
[pos
+ nr_entries
- 1]->name
);
856 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
857 unsigned long df_conflicts
,
858 struct name_entry
*names
,
859 struct traverse_info
*info
)
861 struct unpack_trees_options
*o
= info
->data
;
864 struct tree_desc t
[MAX_UNPACK_TREES
];
865 void *buf
[MAX_UNPACK_TREES
];
866 struct traverse_info newinfo
;
867 struct name_entry
*p
;
870 nr_entries
= all_trees_same_as_cache_tree(n
, dirmask
, names
, info
);
871 if (nr_entries
> 0) {
872 int pos
= index_pos_by_traverse_info(names
, info
);
874 if (!o
->merge
|| df_conflicts
)
875 BUG("Wrong condition to get here buddy");
878 * All entries up to 'pos' must have been processed
879 * (i.e. marked CE_UNPACKED) at this point. But to be safe,
880 * save and restore cache_bottom anyway to not miss
881 * unprocessed entries before 'pos'.
883 bottom
= o
->cache_bottom
;
884 ret
= traverse_by_cache_tree(pos
, nr_entries
, n
, info
);
885 o
->cache_bottom
= bottom
;
895 newinfo
.pathspec
= info
->pathspec
;
896 newinfo
.name
= p
->path
;
897 newinfo
.namelen
= p
->pathlen
;
898 newinfo
.mode
= p
->mode
;
899 newinfo
.pathlen
= st_add3(newinfo
.pathlen
, tree_entry_len(p
), 1);
900 newinfo
.df_conflicts
|= df_conflicts
;
903 * Fetch the tree from the ODB for each peer directory in the
906 * For 2- and 3-way traversals, we try to avoid hitting the
907 * ODB twice for the same OID. This should yield a nice speed
908 * up in checkouts and merges when the commits are similar.
910 * We don't bother doing the full O(n^2) search for larger n,
911 * because wider traversals don't happen that often and we
912 * avoid the search setup.
914 * When 2 peer OIDs are the same, we just copy the tree
915 * descriptor data. This implicitly borrows the buffer
916 * data from the earlier cell.
918 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
919 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
921 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
924 const struct object_id
*oid
= NULL
;
927 buf
[nr_buf
++] = fill_tree_descriptor(the_repository
, t
+ i
, oid
);
931 bottom
= switch_cache_bottom(&newinfo
);
932 ret
= traverse_trees(o
->src_index
, n
, t
, &newinfo
);
933 restore_cache_bottom(&newinfo
, bottom
);
935 for (i
= 0; i
< nr_buf
; i
++)
942 * Compare the traverse-path to the cache entry without actually
943 * having to generate the textual representation of the traverse
946 * NOTE! This *only* compares up to the size of the traverse path
947 * itself - the caller needs to do the final check for the cache
948 * entry having more data at the end!
950 static int do_compare_entry_piecewise(const struct cache_entry
*ce
,
951 const struct traverse_info
*info
,
952 const char *name
, size_t namelen
,
959 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
960 info
->name
, info
->namelen
,
965 pathlen
= info
->pathlen
;
966 ce_len
= ce_namelen(ce
);
968 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
969 if (ce_len
< pathlen
)
973 ce_name
= ce
->name
+ pathlen
;
975 return df_name_compare(ce_name
, ce_len
, S_IFREG
, name
, namelen
, mode
);
978 static int do_compare_entry(const struct cache_entry
*ce
,
979 const struct traverse_info
*info
,
980 const char *name
, size_t namelen
,
989 * If we have not precomputed the traverse path, it is quicker
990 * to avoid doing so. But if we have precomputed it,
991 * it is quicker to use the precomputed version.
993 if (!info
->traverse_path
)
994 return do_compare_entry_piecewise(ce
, info
, name
, namelen
, mode
);
996 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
1000 pathlen
= info
->pathlen
;
1001 ce_len
= ce_namelen(ce
);
1003 if (ce_len
< pathlen
)
1007 ce_name
= ce
->name
+ pathlen
;
1009 ce_mode
= S_ISSPARSEDIR(ce
->ce_mode
) ? S_IFDIR
: S_IFREG
;
1010 return df_name_compare(ce_name
, ce_len
, ce_mode
, name
, namelen
, mode
);
1013 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
1015 int cmp
= do_compare_entry(ce
, info
, n
->path
, n
->pathlen
, n
->mode
);
1020 * At this point, we know that we have a prefix match. If ce
1021 * is a sparse directory, then allow an exact match. This only
1022 * works when the input name is a directory, since ce->name
1023 * ends in a directory separator.
1025 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
1026 ce
->ce_namelen
== traverse_path_len(info
, tree_entry_len(n
)) + 1)
1030 * Even if the beginning compared identically, the ce should
1031 * compare as bigger than a directory leading up to it!
1033 return ce_namelen(ce
) > traverse_path_len(info
, tree_entry_len(n
));
1036 static int ce_in_traverse_path(const struct cache_entry
*ce
,
1037 const struct traverse_info
*info
)
1041 if (do_compare_entry(ce
, info
->prev
,
1042 info
->name
, info
->namelen
, info
->mode
))
1045 * If ce (blob) is the same name as the path (which is a tree
1046 * we will be descending into), it won't be inside it.
1048 return (info
->pathlen
< ce_namelen(ce
));
1051 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
,
1052 const struct name_entry
*n
,
1054 struct index_state
*istate
,
1056 int is_sparse_directory
)
1058 size_t len
= traverse_path_len(info
, tree_entry_len(n
));
1059 size_t alloc_len
= is_sparse_directory
? len
+ 1 : len
;
1060 struct cache_entry
*ce
=
1062 make_empty_transient_cache_entry(alloc_len
, NULL
) :
1063 make_empty_cache_entry(istate
, alloc_len
);
1065 ce
->ce_mode
= create_ce_mode(n
->mode
);
1066 ce
->ce_flags
= create_ce_flags(stage
);
1067 ce
->ce_namelen
= len
;
1068 oidcpy(&ce
->oid
, &n
->oid
);
1069 /* len+1 because the cache_entry allocates space for NUL */
1070 make_traverse_path(ce
->name
, len
+ 1, info
, n
->path
, n
->pathlen
);
1072 if (is_sparse_directory
) {
1073 ce
->name
[len
] = '/';
1074 ce
->name
[len
+ 1] = '\0';
1076 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
1083 * Note that traverse_by_cache_tree() duplicates some logic in this function
1084 * without actually calling it. If you change the logic here you may need to
1085 * check and change there as well.
1087 static int unpack_single_entry(int n
, unsigned long mask
,
1088 unsigned long dirmask
,
1089 struct cache_entry
**src
,
1090 const struct name_entry
*names
,
1091 const struct traverse_info
*info
)
1094 struct unpack_trees_options
*o
= info
->data
;
1095 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
1097 if (mask
== dirmask
&& !src
[0])
1101 * When we have a sparse directory entry for src[0],
1102 * then this isn't necessarily a directory-file conflict.
1104 if (mask
== dirmask
&& src
[0] &&
1105 S_ISSPARSEDIR(src
[0]->ce_mode
))
1109 * Ok, we've filled in up to any potential index entry in src[0],
1112 for (i
= 0; i
< n
; i
++) {
1114 unsigned int bit
= 1ul << i
;
1115 if (conflicts
& bit
) {
1116 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
1123 else if (i
+ 1 < o
->head_idx
)
1125 else if (i
+ 1 > o
->head_idx
)
1131 * If the merge bit is set, then the cache entries are
1132 * discarded in the following block. In this case,
1133 * construct "transient" cache_entries, as they are
1134 * not stored in the index. otherwise construct the
1135 * cache entry from the index aware logic.
1137 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
,
1138 &o
->result
, o
->merge
,
1143 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
1145 for (i
= 0; i
< n
; i
++) {
1146 struct cache_entry
*ce
= src
[i
+ o
->merge
];
1147 if (ce
!= o
->df_conflict_entry
)
1148 discard_cache_entry(ce
);
1153 for (i
= 0; i
< n
; i
++)
1154 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
1155 if (do_add_entry(o
, src
[i
], 0, 0))
1161 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
1163 discard_index(&o
->result
);
1164 if (!o
->quiet
&& !o
->exiting_early
) {
1166 return error("%s", message
);
1173 * The tree traversal is looking at name p. If we have a matching entry,
1174 * return it. If name p is a directory in the index, do not return
1175 * anything, as we will want to match it when the traversal descends into
1178 static int find_cache_pos(struct traverse_info
*info
,
1179 const char *p
, size_t p_len
)
1182 struct unpack_trees_options
*o
= info
->data
;
1183 struct index_state
*index
= o
->src_index
;
1184 int pfxlen
= info
->pathlen
;
1186 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
1187 const struct cache_entry
*ce
= index
->cache
[pos
];
1188 const char *ce_name
, *ce_slash
;
1191 if (ce
->ce_flags
& CE_UNPACKED
) {
1193 * cache_bottom entry is already unpacked, so
1194 * we can never match it; don't check it
1197 if (pos
== o
->cache_bottom
)
1201 if (!ce_in_traverse_path(ce
, info
)) {
1203 * Check if we can skip future cache checks
1204 * (because we're already past all possible
1205 * entries in the traverse path).
1207 if (info
->traverse_path
) {
1208 if (strncmp(ce
->name
, info
->traverse_path
,
1214 ce_name
= ce
->name
+ pfxlen
;
1215 ce_slash
= strchr(ce_name
, '/');
1217 ce_len
= ce_slash
- ce_name
;
1219 ce_len
= ce_namelen(ce
) - pfxlen
;
1220 cmp
= name_compare(p
, p_len
, ce_name
, ce_len
);
1222 * Exact match; if we have a directory we need to
1223 * delay returning it.
1226 return ce_slash
? -2 - pos
: pos
;
1228 continue; /* keep looking */
1230 * ce_name sorts after p->path; could it be that we
1231 * have files under p->path directory in the index?
1232 * E.g. ce_name == "t-i", and p->path == "t"; we may
1233 * have "t/a" in the index.
1235 if (p_len
< ce_len
&& !memcmp(ce_name
, p
, p_len
) &&
1236 ce_name
[p_len
] < '/')
1237 continue; /* keep looking */
1244 * Given a sparse directory entry 'ce', compare ce->name to
1245 * info->name + '/' + p->path + '/' if info->name is non-empty.
1246 * Compare ce->name to p->path + '/' otherwise. Note that
1247 * ce->name must end in a trailing '/' because it is a sparse
1250 static int sparse_dir_matches_path(const struct cache_entry
*ce
,
1251 struct traverse_info
*info
,
1252 const struct name_entry
*p
)
1254 assert(S_ISSPARSEDIR(ce
->ce_mode
));
1255 assert(ce
->name
[ce
->ce_namelen
- 1] == '/');
1258 return ce
->ce_namelen
== info
->namelen
+ p
->pathlen
+ 2 &&
1259 ce
->name
[info
->namelen
] == '/' &&
1260 !strncmp(ce
->name
, info
->name
, info
->namelen
) &&
1261 !strncmp(ce
->name
+ info
->namelen
+ 1, p
->path
, p
->pathlen
);
1262 return ce
->ce_namelen
== p
->pathlen
+ 1 &&
1263 !strncmp(ce
->name
, p
->path
, p
->pathlen
);
1266 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
1267 const struct name_entry
*p
)
1269 struct cache_entry
*ce
;
1270 int pos
= find_cache_pos(info
, p
->path
, p
->pathlen
);
1271 struct unpack_trees_options
*o
= info
->data
;
1274 return o
->src_index
->cache
[pos
];
1277 * Check for a sparse-directory entry named "path/".
1278 * Due to the input p->path not having a trailing
1279 * slash, the negative 'pos' value overshoots the
1280 * expected position, hence "-2" instead of "-1".
1284 if (pos
< 0 || pos
>= o
->src_index
->cache_nr
)
1288 * Due to lexicographic sorting and sparse directory
1289 * entries ending with a trailing slash, our path as a
1290 * sparse directory (e.g "subdir/") and our path as a
1291 * file (e.g. "subdir") might be separated by other
1292 * paths (e.g. "subdir-").
1295 ce
= o
->src_index
->cache
[pos
];
1297 if (strncmp(ce
->name
, p
->path
, p
->pathlen
))
1300 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
1301 sparse_dir_matches_path(ce
, info
, p
))
1310 static void debug_path(struct traverse_info
*info
)
1313 debug_path(info
->prev
);
1314 if (*info
->prev
->name
)
1317 printf("%s", info
->name
);
1320 static void debug_name_entry(int i
, struct name_entry
*n
)
1322 printf("ent#%d %06o %s\n", i
,
1323 n
->path
? n
->mode
: 0,
1324 n
->path
? n
->path
: "(missing)");
1327 static void debug_unpack_callback(int n
,
1329 unsigned long dirmask
,
1330 struct name_entry
*names
,
1331 struct traverse_info
*info
)
1334 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
1338 for (i
= 0; i
< n
; i
++)
1339 debug_name_entry(i
, names
+ i
);
1343 * Returns true if and only if the given cache_entry is a
1344 * sparse-directory entry that matches the given name_entry
1345 * from the tree walk at the given traverse_info.
1347 static int is_sparse_directory_entry(struct cache_entry
*ce
,
1348 struct name_entry
*name
,
1349 struct traverse_info
*info
)
1351 if (!ce
|| !name
|| !S_ISSPARSEDIR(ce
->ce_mode
))
1354 return sparse_dir_matches_path(ce
, info
, name
);
1358 * Note that traverse_by_cache_tree() duplicates some logic in this function
1359 * without actually calling it. If you change the logic here you may need to
1360 * check and change there as well.
1362 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
1364 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
1365 struct unpack_trees_options
*o
= info
->data
;
1366 const struct name_entry
*p
= names
;
1368 /* Find first entry with a real name (we could use "mask" too) */
1372 if (o
->debug_unpack
)
1373 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
1375 /* Are we supposed to look at the index too? */
1379 struct cache_entry
*ce
;
1381 if (o
->diff_index_cached
)
1382 ce
= next_cache_entry(o
);
1384 ce
= find_cache_entry(info
, p
);
1388 cmp
= compare_entry(ce
, info
, p
);
1390 if (unpack_index_entry(ce
, o
) < 0)
1391 return unpack_failed(o
, NULL
);
1397 * If we skip unmerged index
1398 * entries, we'll skip this
1399 * entry *and* the tree
1400 * entries associated with it!
1402 if (o
->skip_unmerged
) {
1403 add_same_unmerged(ce
, o
);
1413 if (unpack_single_entry(n
, mask
, dirmask
, src
, names
, info
) < 0)
1416 if (o
->merge
&& src
[0]) {
1417 if (ce_stage(src
[0]))
1418 mark_ce_used_same_name(src
[0], o
);
1420 mark_ce_used(src
[0], o
);
1423 /* Now handle any directories.. */
1425 /* special case: "diff-index --cached" looking at a tree */
1426 if (o
->diff_index_cached
&&
1427 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1429 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1432 * Everything under the name matches; skip the
1433 * entire hierarchy. diff_index_cached codepath
1434 * special cases D/F conflicts in such a way that
1435 * it does not do any look-ahead, so this is safe.
1438 o
->cache_bottom
+= matches
;
1443 if (!is_sparse_directory_entry(src
[0], names
, info
) &&
1444 traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1455 static int clear_ce_flags_1(struct index_state
*istate
,
1456 struct cache_entry
**cache
, int nr
,
1457 struct strbuf
*prefix
,
1458 int select_mask
, int clear_mask
,
1459 struct pattern_list
*pl
,
1460 enum pattern_match_result default_match
,
1463 /* Whole directory matching */
1464 static int clear_ce_flags_dir(struct index_state
*istate
,
1465 struct cache_entry
**cache
, int nr
,
1466 struct strbuf
*prefix
,
1468 int select_mask
, int clear_mask
,
1469 struct pattern_list
*pl
,
1470 enum pattern_match_result default_match
,
1473 struct cache_entry
**cache_end
;
1476 enum pattern_match_result ret
, orig_ret
;
1477 orig_ret
= path_matches_pattern_list(prefix
->buf
, prefix
->len
,
1478 basename
, &dtype
, pl
, istate
);
1480 strbuf_addch(prefix
, '/');
1482 /* If undecided, use matching result of parent dir in defval */
1483 if (orig_ret
== UNDECIDED
)
1484 ret
= default_match
;
1488 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1489 struct cache_entry
*ce
= *cache_end
;
1490 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1494 if (pl
->use_cone_patterns
&& orig_ret
== MATCHED_RECURSIVE
) {
1495 struct cache_entry
**ce
= cache
;
1496 rc
= cache_end
- cache
;
1498 while (ce
< cache_end
) {
1499 (*ce
)->ce_flags
&= ~clear_mask
;
1502 } else if (pl
->use_cone_patterns
&& orig_ret
== NOT_MATCHED
) {
1503 rc
= cache_end
- cache
;
1505 rc
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1507 select_mask
, clear_mask
,
1512 strbuf_setlen(prefix
, prefix
->len
- 1);
1517 * Traverse the index, find every entry that matches according to
1518 * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the
1519 * number of traversed entries.
1521 * If select_mask is non-zero, only entries whose ce_flags has on of
1522 * those bits enabled are traversed.
1524 * cache : pointer to an index entry
1525 * prefix_len : an offset to its path
1527 * The current path ("prefix") including the trailing '/' is
1528 * cache[0]->name[0..(prefix_len-1)]
1529 * Top level path has prefix_len zero.
1531 static int clear_ce_flags_1(struct index_state
*istate
,
1532 struct cache_entry
**cache
, int nr
,
1533 struct strbuf
*prefix
,
1534 int select_mask
, int clear_mask
,
1535 struct pattern_list
*pl
,
1536 enum pattern_match_result default_match
,
1539 struct cache_entry
**cache_end
= nr
? cache
+ nr
: cache
;
1542 * Process all entries that have the given prefix and meet
1543 * select_mask condition
1545 while(cache
!= cache_end
) {
1546 struct cache_entry
*ce
= *cache
;
1547 const char *name
, *slash
;
1549 enum pattern_match_result ret
;
1551 display_progress(istate
->progress
, progress_nr
);
1553 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1559 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1562 name
= ce
->name
+ prefix
->len
;
1563 slash
= strchr(name
, '/');
1565 /* If it's a directory, try whole directory match first */
1570 strbuf_add(prefix
, name
, len
);
1572 processed
= clear_ce_flags_dir(istate
, cache
, cache_end
- cache
,
1574 prefix
->buf
+ prefix
->len
- len
,
1575 select_mask
, clear_mask
,
1579 /* clear_c_f_dir eats a whole dir already? */
1582 progress_nr
+= processed
;
1583 strbuf_setlen(prefix
, prefix
->len
- len
);
1587 strbuf_addch(prefix
, '/');
1588 processed
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1590 select_mask
, clear_mask
, pl
,
1591 default_match
, progress_nr
);
1594 progress_nr
+= processed
;
1596 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1601 dtype
= ce_to_dtype(ce
);
1602 ret
= path_matches_pattern_list(ce
->name
,
1604 name
, &dtype
, pl
, istate
);
1605 if (ret
== UNDECIDED
)
1606 ret
= default_match
;
1607 if (ret
== MATCHED
|| ret
== MATCHED_RECURSIVE
)
1608 ce
->ce_flags
&= ~clear_mask
;
1613 display_progress(istate
->progress
, progress_nr
);
1614 return nr
- (cache_end
- cache
);
1617 static int clear_ce_flags(struct index_state
*istate
,
1618 int select_mask
, int clear_mask
,
1619 struct pattern_list
*pl
,
1622 static struct strbuf prefix
= STRBUF_INIT
;
1626 strbuf_reset(&prefix
);
1628 istate
->progress
= start_delayed_progress(
1629 _("Updating index flags"),
1632 xsnprintf(label
, sizeof(label
), "clear_ce_flags(0x%08lx,0x%08lx)",
1633 (unsigned long)select_mask
, (unsigned long)clear_mask
);
1634 trace2_region_enter("unpack_trees", label
, the_repository
);
1635 rval
= clear_ce_flags_1(istate
,
1639 select_mask
, clear_mask
,
1641 trace2_region_leave("unpack_trees", label
, the_repository
);
1643 stop_progress(&istate
->progress
);
1648 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1650 static void mark_new_skip_worktree(struct pattern_list
*pl
,
1651 struct index_state
*istate
,
1652 int select_flag
, int skip_wt_flag
,
1658 * 1. Pretend the narrowest worktree: only unmerged entries
1661 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1662 struct cache_entry
*ce
= istate
->cache
[i
];
1664 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1667 if (!ce_stage(ce
) && !(ce
->ce_flags
& CE_CONFLICTED
))
1668 ce
->ce_flags
|= skip_wt_flag
;
1670 ce
->ce_flags
&= ~skip_wt_flag
;
1674 * 2. Widen worktree according to sparse-checkout file.
1675 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1677 clear_ce_flags(istate
, select_flag
, skip_wt_flag
, pl
, show_progress
);
1680 static void populate_from_existing_patterns(struct unpack_trees_options
*o
,
1681 struct pattern_list
*pl
)
1683 if (get_sparse_checkout_patterns(pl
) < 0)
1684 o
->skip_sparse_checkout
= 1;
1690 static int verify_absent(const struct cache_entry
*,
1691 enum unpack_trees_error_types
,
1692 struct unpack_trees_options
*);
1694 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1695 * resulting index, -2 on failure to reflect the changes to the work tree.
1697 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1699 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1701 struct repository
*repo
= the_repository
;
1703 static struct cache_entry
*dfc
;
1704 struct pattern_list pl
;
1705 int free_pattern_list
= 0;
1707 if (len
> MAX_UNPACK_TREES
)
1708 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1710 trace_performance_enter();
1711 trace2_region_enter("unpack_trees", "unpack_trees", the_repository
);
1713 prepare_repo_settings(repo
);
1714 if (repo
->settings
.command_requires_full_index
) {
1715 ensure_full_index(o
->src_index
);
1716 ensure_full_index(o
->dst_index
);
1719 if (!core_apply_sparse_checkout
|| !o
->update
)
1720 o
->skip_sparse_checkout
= 1;
1721 if (!o
->skip_sparse_checkout
&& !o
->pl
) {
1722 memset(&pl
, 0, sizeof(pl
));
1723 free_pattern_list
= 1;
1724 populate_from_existing_patterns(o
, &pl
);
1727 memset(&o
->result
, 0, sizeof(o
->result
));
1728 o
->result
.initialized
= 1;
1729 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1730 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1731 o
->result
.version
= o
->src_index
->version
;
1732 if (!o
->src_index
->split_index
) {
1733 o
->result
.split_index
= NULL
;
1734 } else if (o
->src_index
== o
->dst_index
) {
1736 * o->dst_index (and thus o->src_index) will be discarded
1737 * and overwritten with o->result at the end of this function,
1738 * so just use src_index's split_index to avoid having to
1741 o
->result
.split_index
= o
->src_index
->split_index
;
1742 o
->result
.split_index
->refcount
++;
1744 o
->result
.split_index
= init_split_index(&o
->result
);
1746 oidcpy(&o
->result
.oid
, &o
->src_index
->oid
);
1747 o
->merge_size
= len
;
1748 mark_all_ce_unused(o
->src_index
);
1750 o
->result
.fsmonitor_last_update
=
1751 xstrdup_or_null(o
->src_index
->fsmonitor_last_update
);
1754 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1756 if (!o
->skip_sparse_checkout
)
1757 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1758 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1761 dfc
= xcalloc(1, cache_entry_size(0));
1762 o
->df_conflict_entry
= dfc
;
1765 const char *prefix
= o
->prefix
? o
->prefix
: "";
1766 struct traverse_info info
;
1768 setup_traverse_info(&info
, prefix
);
1769 info
.fn
= unpack_callback
;
1771 info
.show_all_errors
= o
->show_all_errors
;
1772 info
.pathspec
= o
->pathspec
;
1776 * Unpack existing index entries that sort before the
1777 * prefix the tree is spliced into. Note that o->merge
1778 * is always true in this case.
1781 struct cache_entry
*ce
= next_cache_entry(o
);
1784 if (ce_in_traverse_path(ce
, &info
))
1786 if (unpack_index_entry(ce
, o
) < 0)
1791 trace_performance_enter();
1792 trace2_region_enter("unpack_trees", "traverse_trees", the_repository
);
1793 ret
= traverse_trees(o
->src_index
, len
, t
, &info
);
1794 trace2_region_leave("unpack_trees", "traverse_trees", the_repository
);
1795 trace_performance_leave("traverse_trees");
1800 /* Any left-over entries in the index? */
1803 struct cache_entry
*ce
= next_cache_entry(o
);
1806 if (unpack_index_entry(ce
, o
) < 0)
1810 mark_all_ce_unused(o
->src_index
);
1812 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1813 ret
= unpack_failed(o
, "Merge requires file-level merging");
1817 if (!o
->skip_sparse_checkout
) {
1819 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1820 * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1821 * so apply_sparse_checkout() won't attempt to remove it from worktree
1823 mark_new_skip_worktree(o
->pl
, &o
->result
,
1824 CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
,
1828 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1829 struct cache_entry
*ce
= o
->result
.cache
[i
];
1832 * Entries marked with CE_ADDED in merged_entry() do not have
1833 * verify_absent() check (the check is effectively disabled
1834 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1836 * Do the real check now because we have had
1837 * correct CE_NEW_SKIP_WORKTREE
1839 if (ce
->ce_flags
& CE_ADDED
&&
1840 verify_absent(ce
, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
, o
))
1843 if (apply_sparse_checkout(&o
->result
, ce
, o
))
1848 * Inability to sparsify or de-sparsify individual
1849 * paths is not an error, but just a warning.
1851 if (o
->show_all_errors
)
1852 display_warning_msgs(o
);
1857 ret
= check_updates(o
, &o
->result
) ? (-2) : 0;
1859 move_index_extensions(&o
->result
, o
->src_index
);
1861 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
1862 cache_tree_verify(the_repository
, &o
->result
);
1863 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1864 cache_tree_update(&o
->result
,
1869 o
->result
.updated_workdir
= 1;
1870 discard_index(o
->dst_index
);
1871 *o
->dst_index
= o
->result
;
1873 discard_index(&o
->result
);
1875 o
->src_index
= NULL
;
1878 if (free_pattern_list
)
1879 clear_pattern_list(&pl
);
1880 trace2_region_leave("unpack_trees", "unpack_trees", the_repository
);
1881 trace_performance_leave("unpack_trees");
1885 if (o
->show_all_errors
)
1886 display_error_msgs(o
);
1887 mark_all_ce_unused(o
->src_index
);
1888 ret
= unpack_failed(o
, NULL
);
1889 if (o
->exiting_early
)
1895 * Update SKIP_WORKTREE bits according to sparsity patterns, and update
1896 * working directory to match.
1898 * CE_NEW_SKIP_WORKTREE is used internally.
1900 enum update_sparsity_result
update_sparsity(struct unpack_trees_options
*o
)
1902 enum update_sparsity_result ret
= UPDATE_SPARSITY_SUCCESS
;
1903 struct pattern_list pl
;
1905 unsigned old_show_all_errors
;
1906 int free_pattern_list
= 0;
1908 old_show_all_errors
= o
->show_all_errors
;
1909 o
->show_all_errors
= 1;
1912 if (!o
->update
|| o
->index_only
|| o
->skip_sparse_checkout
)
1913 BUG("update_sparsity() is for reflecting sparsity patterns in working directory");
1914 if (o
->src_index
!= o
->dst_index
|| o
->fn
)
1915 BUG("update_sparsity() called wrong");
1917 trace_performance_enter();
1919 /* If we weren't given patterns, use the recorded ones */
1921 memset(&pl
, 0, sizeof(pl
));
1922 free_pattern_list
= 1;
1923 populate_from_existing_patterns(o
, &pl
);
1924 if (o
->skip_sparse_checkout
)
1925 goto skip_sparse_checkout
;
1928 /* Set NEW_SKIP_WORKTREE on existing entries. */
1929 mark_all_ce_unused(o
->src_index
);
1930 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1931 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1933 /* Then loop over entries and update/remove as needed */
1934 ret
= UPDATE_SPARSITY_SUCCESS
;
1935 for (i
= 0; i
< o
->src_index
->cache_nr
; i
++) {
1936 struct cache_entry
*ce
= o
->src_index
->cache
[i
];
1940 /* -1 because for loop will increment by 1 */
1941 i
+= warn_conflicted_path(o
->src_index
, i
, o
) - 1;
1942 ret
= UPDATE_SPARSITY_WARNINGS
;
1946 if (apply_sparse_checkout(o
->src_index
, ce
, o
))
1947 ret
= UPDATE_SPARSITY_WARNINGS
;
1950 skip_sparse_checkout
:
1951 if (check_updates(o
, o
->src_index
))
1952 ret
= UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES
;
1954 display_warning_msgs(o
);
1955 o
->show_all_errors
= old_show_all_errors
;
1956 if (free_pattern_list
)
1957 clear_pattern_list(&pl
);
1958 trace_performance_leave("update_sparsity");
1962 /* Here come the merge functions */
1964 static int reject_merge(const struct cache_entry
*ce
,
1965 struct unpack_trees_options
*o
)
1967 return add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1970 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1976 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1978 return a
->ce_mode
== b
->ce_mode
&&
1979 oideq(&a
->oid
, &b
->oid
);
1984 * When a CE gets turned into an unmerged entry, we
1985 * want it to be up-to-date
1987 static int verify_uptodate_1(const struct cache_entry
*ce
,
1988 struct unpack_trees_options
*o
,
1989 enum unpack_trees_error_types error_type
)
1997 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1998 * if this entry is truly up-to-date because this file may be
2001 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
2002 ; /* keep checking */
2003 else if (o
->reset
|| ce_uptodate(ce
))
2006 if (!lstat(ce
->name
, &st
)) {
2007 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
2008 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
2010 if (submodule_from_ce(ce
)) {
2011 int r
= check_submodule_move_head(ce
,
2012 "HEAD", oid_to_hex(&ce
->oid
), o
);
2014 return add_rejected_path(o
, error_type
, ce
->name
);
2021 * Historic default policy was to allow submodule to be out
2022 * of sync wrt the superproject index. If the submodule was
2023 * not considered interesting above, we don't care here.
2025 if (S_ISGITLINK(ce
->ce_mode
))
2030 if (errno
== ENOENT
)
2032 return add_rejected_path(o
, error_type
, ce
->name
);
2035 int verify_uptodate(const struct cache_entry
*ce
,
2036 struct unpack_trees_options
*o
)
2038 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
2040 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
2043 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
2044 struct unpack_trees_options
*o
)
2046 return verify_uptodate_1(ce
, o
, WARNING_SPARSE_NOT_UPTODATE_FILE
);
2050 * TODO: We should actually invalidate o->result, not src_index [1].
2051 * But since cache tree and untracked cache both are not copied to
2052 * o->result until unpacking is complete, we invalidate them on
2053 * src_index instead with the assumption that they will be copied to
2054 * dst_index at the end.
2056 * [1] src_index->cache_tree is also used in unpack_callback() so if
2057 * we invalidate o->result, we need to update it to use
2058 * o->result.cache_tree as well.
2060 static void invalidate_ce_path(const struct cache_entry
*ce
,
2061 struct unpack_trees_options
*o
)
2065 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
2066 untracked_cache_invalidate_path(o
->src_index
, ce
->name
, 1);
2070 * Check that checking out ce->sha1 in subdir ce->name is not
2071 * going to overwrite any working files.
2073 static int verify_clean_submodule(const char *old_sha1
,
2074 const struct cache_entry
*ce
,
2075 struct unpack_trees_options
*o
)
2077 if (!submodule_from_ce(ce
))
2080 return check_submodule_move_head(ce
, old_sha1
,
2081 oid_to_hex(&ce
->oid
), o
);
2084 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
2085 struct unpack_trees_options
*o
)
2088 * we are about to extract "ce->name"; we would not want to lose
2089 * anything in the existing directory there.
2093 struct dir_struct d
;
2097 if (S_ISGITLINK(ce
->ce_mode
)) {
2098 struct object_id oid
;
2099 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", &oid
);
2101 * If we are not going to update the submodule, then
2104 if (!sub_head
&& oideq(&oid
, &ce
->oid
))
2106 return verify_clean_submodule(sub_head
? NULL
: oid_to_hex(&oid
),
2111 * First let's make sure we do not have a local modification
2112 * in that directory.
2114 namelen
= ce_namelen(ce
);
2115 for (i
= locate_in_src_index(ce
, o
);
2116 i
< o
->src_index
->cache_nr
;
2118 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
2119 int len
= ce_namelen(ce2
);
2120 if (len
< namelen
||
2121 strncmp(ce
->name
, ce2
->name
, namelen
) ||
2122 ce2
->name
[namelen
] != '/')
2125 * ce2->name is an entry in the subdirectory to be
2128 if (!ce_stage(ce2
)) {
2129 if (verify_uptodate(ce2
, o
))
2131 add_entry(o
, ce2
, CE_REMOVE
, 0);
2132 invalidate_ce_path(ce
, o
);
2133 mark_ce_used(ce2
, o
);
2139 * Then we need to make sure that we do not lose a locally
2140 * present file that is not ignored.
2142 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
2144 memset(&d
, 0, sizeof(d
));
2146 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
2147 i
= read_directory(&d
, o
->src_index
, pathbuf
, namelen
+1, NULL
);
2149 return add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
2155 * This gets called when there was no index entry for the tree entry 'dst',
2156 * but we found a file in the working tree that 'lstat()' said was fine,
2157 * and we're on a case-insensitive filesystem.
2159 * See if we can find a case-insensitive match in the index that also
2160 * matches the stat information, and assume it's that other file!
2162 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
2164 const struct cache_entry
*src
;
2166 src
= index_file_exists(o
->src_index
, name
, len
, 1);
2167 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
2170 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
2171 const struct cache_entry
*ce
, struct stat
*st
,
2172 enum unpack_trees_error_types error_type
,
2173 struct unpack_trees_options
*o
)
2175 const struct cache_entry
*result
;
2178 * It may be that the 'lstat()' succeeded even though
2179 * target 'ce' was absent, because there is an old
2180 * entry that is different only in case..
2182 * Ignore that lstat() if it matches.
2184 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
2188 is_excluded(o
->dir
, o
->src_index
, name
, &dtype
))
2190 * ce->name is explicitly excluded, so it is Ok to
2194 if (S_ISDIR(st
->st_mode
)) {
2196 * We are checking out path "foo" and
2197 * found "foo/." in the working tree.
2198 * This is tricky -- if we have modified
2199 * files that are in "foo/" we would lose
2202 if (verify_clean_subdirectory(ce
, o
) < 0)
2208 * The previous round may already have decided to
2209 * delete this path, which is in a subdirectory that
2210 * is being replaced with a blob.
2212 result
= index_file_exists(&o
->result
, name
, len
, 0);
2214 if (result
->ce_flags
& CE_REMOVE
)
2218 return add_rejected_path(o
, error_type
, name
);
2222 * We do not want to remove or overwrite a working tree file that
2223 * is not tracked, unless it is ignored.
2225 static int verify_absent_1(const struct cache_entry
*ce
,
2226 enum unpack_trees_error_types error_type
,
2227 struct unpack_trees_options
*o
)
2232 if (o
->index_only
|| o
->reset
|| !o
->update
)
2235 len
= check_leading_path(ce
->name
, ce_namelen(ce
), 0);
2242 path
= xmemdupz(ce
->name
, len
);
2243 if (lstat(path
, &st
))
2244 ret
= error_errno("cannot stat '%s'", path
);
2246 if (submodule_from_ce(ce
))
2247 ret
= check_submodule_move_head(ce
,
2248 oid_to_hex(&ce
->oid
),
2251 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
2252 &st
, error_type
, o
);
2256 } else if (lstat(ce
->name
, &st
)) {
2257 if (errno
!= ENOENT
)
2258 return error_errno("cannot stat '%s'", ce
->name
);
2261 if (submodule_from_ce(ce
))
2262 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
2265 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
2266 ce_to_dtype(ce
), ce
, &st
,
2271 static int verify_absent(const struct cache_entry
*ce
,
2272 enum unpack_trees_error_types error_type
,
2273 struct unpack_trees_options
*o
)
2275 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
2277 return verify_absent_1(ce
, error_type
, o
);
2280 static int verify_absent_sparse(const struct cache_entry
*ce
,
2281 enum unpack_trees_error_types error_type
,
2282 struct unpack_trees_options
*o
)
2284 return verify_absent_1(ce
, error_type
, o
);
2287 static int merged_entry(const struct cache_entry
*ce
,
2288 const struct cache_entry
*old
,
2289 struct unpack_trees_options
*o
)
2291 int update
= CE_UPDATE
;
2292 struct cache_entry
*merge
= dup_cache_entry(ce
, &o
->result
);
2296 * New index entries. In sparse checkout, the following
2297 * verify_absent() will be delayed until after
2298 * traverse_trees() finishes in unpack_trees(), then:
2300 * - CE_NEW_SKIP_WORKTREE will be computed correctly
2301 * - verify_absent() be called again, this time with
2302 * correct CE_NEW_SKIP_WORKTREE
2304 * verify_absent() call here does nothing in sparse
2305 * checkout (i.e. o->skip_sparse_checkout == 0)
2308 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
2310 if (verify_absent(merge
,
2311 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
2312 discard_cache_entry(merge
);
2315 invalidate_ce_path(merge
, o
);
2317 if (submodule_from_ce(ce
) && file_exists(ce
->name
)) {
2318 int ret
= check_submodule_move_head(ce
, NULL
,
2319 oid_to_hex(&ce
->oid
),
2325 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
2327 * See if we can re-use the old CE directly?
2328 * That way we get the uptodate stat info.
2330 * This also removes the UPDATE flag on a match; otherwise
2331 * we will end up overwriting local changes in the work tree.
2333 if (same(old
, merge
)) {
2334 copy_cache_entry(merge
, old
);
2337 if (verify_uptodate(old
, o
)) {
2338 discard_cache_entry(merge
);
2341 /* Migrate old flags over */
2342 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
2343 invalidate_ce_path(old
, o
);
2346 if (submodule_from_ce(ce
) && file_exists(ce
->name
)) {
2347 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
2348 oid_to_hex(&ce
->oid
),
2355 * Previously unmerged entry left as an existence
2356 * marker by read_index_unmerged();
2358 invalidate_ce_path(old
, o
);
2361 if (do_add_entry(o
, merge
, update
, CE_STAGEMASK
) < 0)
2366 static int deleted_entry(const struct cache_entry
*ce
,
2367 const struct cache_entry
*old
,
2368 struct unpack_trees_options
*o
)
2370 /* Did it exist in the index? */
2372 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2376 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
2378 add_entry(o
, ce
, CE_REMOVE
, 0);
2379 invalidate_ce_path(ce
, o
);
2383 static int keep_entry(const struct cache_entry
*ce
,
2384 struct unpack_trees_options
*o
)
2386 add_entry(o
, ce
, 0, 0);
2388 invalidate_ce_path(ce
, o
);
2393 static void show_stage_entry(FILE *o
,
2394 const char *label
, const struct cache_entry
*ce
)
2397 fprintf(o
, "%s (missing)\n", label
);
2399 fprintf(o
, "%s%06o %s %d\t%s\n",
2402 oid_to_hex(&ce
->oid
),
2408 int threeway_merge(const struct cache_entry
* const *stages
,
2409 struct unpack_trees_options
*o
)
2411 const struct cache_entry
*index
;
2412 const struct cache_entry
*head
;
2413 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
2416 int remote_match
= 0;
2418 int df_conflict_head
= 0;
2419 int df_conflict_remote
= 0;
2421 int any_anc_missing
= 0;
2422 int no_anc_exists
= 1;
2425 for (i
= 1; i
< o
->head_idx
; i
++) {
2426 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
2427 any_anc_missing
= 1;
2433 head
= stages
[o
->head_idx
];
2435 if (head
== o
->df_conflict_entry
) {
2436 df_conflict_head
= 1;
2440 if (remote
== o
->df_conflict_entry
) {
2441 df_conflict_remote
= 1;
2446 * First, if there's a #16 situation, note that to prevent #13
2449 if (!same(remote
, head
)) {
2450 for (i
= 1; i
< o
->head_idx
; i
++) {
2451 if (same(stages
[i
], head
)) {
2454 if (same(stages
[i
], remote
)) {
2461 * We start with cases where the index is allowed to match
2462 * something other than the head: #14(ALT) and #2ALT, where it
2463 * is permitted to match the result instead.
2465 /* #14, #14ALT, #2ALT */
2466 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
2467 if (index
&& !same(index
, remote
) && !same(index
, head
))
2468 return reject_merge(index
, o
);
2469 return merged_entry(remote
, index
, o
);
2472 * If we have an entry in the index cache, then we want to
2473 * make sure that it matches head.
2475 if (index
&& !same(index
, head
))
2476 return reject_merge(index
, o
);
2480 if (same(head
, remote
))
2481 return merged_entry(head
, index
, o
);
2483 if (!df_conflict_remote
&& remote_match
&& !head_match
)
2484 return merged_entry(head
, index
, o
);
2488 if (!head
&& !remote
&& any_anc_missing
)
2492 * Under the "aggressive" rule, we resolve mostly trivial
2493 * cases that we historically had git-merge-one-file resolve.
2495 if (o
->aggressive
) {
2496 int head_deleted
= !head
;
2497 int remote_deleted
= !remote
;
2498 const struct cache_entry
*ce
= NULL
;
2507 for (i
= 1; i
< o
->head_idx
; i
++) {
2508 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2517 * Deleted in one and unchanged in the other.
2519 if ((head_deleted
&& remote_deleted
) ||
2520 (head_deleted
&& remote
&& remote_match
) ||
2521 (remote_deleted
&& head
&& head_match
)) {
2523 return deleted_entry(index
, index
, o
);
2524 if (ce
&& !head_deleted
) {
2525 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2531 * Added in both, identically.
2533 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
2534 return merged_entry(head
, index
, o
);
2538 /* Below are "no merge" cases, which require that the index be
2539 * up-to-date to avoid the files getting overwritten with
2540 * conflict resolution files.
2543 if (verify_uptodate(index
, o
))
2547 o
->nontrivial_merge
= 1;
2549 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2551 if (!head_match
|| !remote_match
) {
2552 for (i
= 1; i
< o
->head_idx
; i
++) {
2553 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2554 keep_entry(stages
[i
], o
);
2562 fprintf(stderr
, "read-tree: warning #16 detected\n");
2563 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2564 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2567 if (head
) { count
+= keep_entry(head
, o
); }
2568 if (remote
) { count
+= keep_entry(remote
, o
); }
2575 * The rule is to "carry forward" what is in the index without losing
2576 * information across a "fast-forward", favoring a successful merge
2577 * over a merge failure when it makes sense. For details of the
2578 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2581 int twoway_merge(const struct cache_entry
* const *src
,
2582 struct unpack_trees_options
*o
)
2584 const struct cache_entry
*current
= src
[0];
2585 const struct cache_entry
*oldtree
= src
[1];
2586 const struct cache_entry
*newtree
= src
[2];
2588 if (o
->merge_size
!= 2)
2589 return error("Cannot do a twoway merge of %d trees",
2592 if (oldtree
== o
->df_conflict_entry
)
2594 if (newtree
== o
->df_conflict_entry
)
2598 if (current
->ce_flags
& CE_CONFLICTED
) {
2599 if (same(oldtree
, newtree
) || o
->reset
) {
2601 return deleted_entry(current
, current
, o
);
2603 return merged_entry(newtree
, current
, o
);
2605 return reject_merge(current
, o
);
2606 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2607 (!oldtree
&& newtree
&&
2608 same(current
, newtree
)) || /* 6 and 7 */
2609 (oldtree
&& newtree
&&
2610 same(oldtree
, newtree
)) || /* 14 and 15 */
2611 (oldtree
&& newtree
&&
2612 !same(oldtree
, newtree
) && /* 18 and 19 */
2613 same(current
, newtree
))) {
2614 return keep_entry(current
, o
);
2615 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2617 return deleted_entry(oldtree
, current
, o
);
2618 } else if (oldtree
&& newtree
&&
2619 same(current
, oldtree
) && !same(current
, newtree
)) {
2621 return merged_entry(newtree
, current
, o
);
2623 return reject_merge(current
, o
);
2626 if (oldtree
&& !o
->initial_checkout
) {
2628 * deletion of the path was staged;
2630 if (same(oldtree
, newtree
))
2632 return reject_merge(oldtree
, o
);
2634 return merged_entry(newtree
, current
, o
);
2636 return deleted_entry(oldtree
, current
, o
);
2642 * Keep the index entries at stage0, collapse stage1 but make sure
2643 * stage0 does not have anything there.
2645 int bind_merge(const struct cache_entry
* const *src
,
2646 struct unpack_trees_options
*o
)
2648 const struct cache_entry
*old
= src
[0];
2649 const struct cache_entry
*a
= src
[1];
2651 if (o
->merge_size
!= 1)
2652 return error("Cannot do a bind merge of %d trees",
2655 return o
->quiet
? -1 :
2656 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2657 super_prefixed(a
->name
),
2658 super_prefixed(old
->name
));
2660 return keep_entry(old
, o
);
2662 return merged_entry(a
, NULL
, o
);
2669 * - take the stat information from stage0, take the data from stage1
2671 int oneway_merge(const struct cache_entry
* const *src
,
2672 struct unpack_trees_options
*o
)
2674 const struct cache_entry
*old
= src
[0];
2675 const struct cache_entry
*a
= src
[1];
2677 if (o
->merge_size
!= 1)
2678 return error("Cannot do a oneway merge of %d trees",
2681 if (!a
|| a
== o
->df_conflict_entry
)
2682 return deleted_entry(old
, old
, o
);
2684 if (old
&& same(old
, a
)) {
2686 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
) &&
2687 !(old
->ce_flags
& CE_FSMONITOR_VALID
)) {
2689 if (lstat(old
->name
, &st
) ||
2690 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2691 update
|= CE_UPDATE
;
2693 if (o
->update
&& S_ISGITLINK(old
->ce_mode
) &&
2694 should_update_submodules() && !verify_uptodate(old
, o
))
2695 update
|= CE_UPDATE
;
2696 add_entry(o
, old
, update
, CE_STAGEMASK
);
2699 return merged_entry(a
, old
, o
);
2703 * Merge worktree and untracked entries in a stash entry.
2705 * Ignore all index entries. Collapse remaining trees but make sure that they
2706 * don't have any conflicting files.
2708 int stash_worktree_untracked_merge(const struct cache_entry
* const *src
,
2709 struct unpack_trees_options
*o
)
2711 const struct cache_entry
*worktree
= src
[1];
2712 const struct cache_entry
*untracked
= src
[2];
2714 if (o
->merge_size
!= 2)
2715 BUG("invalid merge_size: %d", o
->merge_size
);
2717 if (worktree
&& untracked
)
2718 return error(_("worktree and untracked commit have duplicate entries: %s"),
2719 super_prefixed(worktree
->name
));
2721 return merged_entry(worktree
? worktree
: untracked
, NULL
, o
);