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_enabled(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_enabled(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_enabled(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_enabled(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_enabled(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_enabled(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_enabled(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_enabled(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_enabled(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 must_checkout(const struct cache_entry
*ce
)
397 return ce
->ce_flags
& CE_UPDATE
;
400 static int check_updates(struct unpack_trees_options
*o
,
401 struct index_state
*index
)
405 struct progress
*progress
;
406 struct checkout state
= CHECKOUT_INIT
;
407 int i
, pc_workers
, pc_threshold
;
409 trace_performance_enter();
412 state
.refresh_cache
= 1;
413 state
.istate
= index
;
414 clone_checkout_metadata(&state
.meta
, &o
->meta
, NULL
);
416 if (!o
->update
|| o
->dry_run
) {
417 remove_marked_cache_entries(index
, 0);
418 trace_performance_leave("check_updates");
423 setup_collided_checkout_detection(&state
, index
);
425 progress
= get_progress(o
, index
);
427 /* Start with clean cache to avoid using any possibly outdated info. */
428 invalidate_lstat_cache();
430 git_attr_set_direction(GIT_ATTR_CHECKOUT
);
432 if (should_update_submodules())
433 load_gitmodules_file(index
, NULL
);
435 for (i
= 0; i
< index
->cache_nr
; i
++) {
436 const struct cache_entry
*ce
= index
->cache
[i
];
438 if (ce
->ce_flags
& CE_WT_REMOVE
) {
439 display_progress(progress
, ++cnt
);
444 remove_marked_cache_entries(index
, 0);
445 remove_scheduled_dirs();
447 if (should_update_submodules())
448 load_gitmodules_file(index
, &state
);
450 if (has_promisor_remote())
452 * Prefetch the objects that are to be checked out in the loop
455 prefetch_cache_entries(index
, must_checkout
);
457 get_parallel_checkout_configs(&pc_workers
, &pc_threshold
);
459 enable_delayed_checkout(&state
);
461 init_parallel_checkout();
462 for (i
= 0; i
< index
->cache_nr
; i
++) {
463 struct cache_entry
*ce
= index
->cache
[i
];
465 if (must_checkout(ce
)) {
466 size_t last_pc_queue_size
= pc_queue_size();
468 if (ce
->ce_flags
& CE_WT_REMOVE
)
469 BUG("both update and delete flags are set on %s",
471 ce
->ce_flags
&= ~CE_UPDATE
;
472 errs
|= checkout_entry(ce
, &state
, NULL
, NULL
);
474 if (last_pc_queue_size
== pc_queue_size())
475 display_progress(progress
, ++cnt
);
479 errs
|= run_parallel_checkout(&state
, pc_workers
, pc_threshold
,
481 stop_progress(&progress
);
482 errs
|= finish_delayed_checkout(&state
, NULL
, o
->verbose_update
);
483 git_attr_set_direction(GIT_ATTR_CHECKIN
);
486 report_collided_checkout(index
);
488 trace_performance_leave("check_updates");
492 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
493 struct unpack_trees_options
*o
);
494 static int verify_absent_sparse(const struct cache_entry
*ce
,
495 enum unpack_trees_error_types
,
496 struct unpack_trees_options
*o
);
498 static int apply_sparse_checkout(struct index_state
*istate
,
499 struct cache_entry
*ce
,
500 struct unpack_trees_options
*o
)
502 int was_skip_worktree
= ce_skip_worktree(ce
);
504 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
505 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
507 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
508 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
509 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
510 mark_fsmonitor_invalid(istate
, ce
);
511 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
515 * if (!was_skip_worktree && !ce_skip_worktree()) {
516 * This is perfectly normal. Move on;
521 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
522 * area as a result of ce_skip_worktree() shortcuts in
523 * verify_absent() and verify_uptodate().
524 * Make sure they don't modify worktree if they are already
525 * outside checkout area
527 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
528 ce
->ce_flags
&= ~CE_UPDATE
;
531 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
532 * on to get that file removed from both index and worktree.
533 * If that file is already outside worktree area, don't
536 if (ce
->ce_flags
& CE_REMOVE
)
537 ce
->ce_flags
&= ~CE_WT_REMOVE
;
540 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
542 * If CE_UPDATE is set, verify_uptodate() must be called already
543 * also stat info may have lost after merged_entry() so calling
544 * verify_uptodate() again may fail
546 if (!(ce
->ce_flags
& CE_UPDATE
) &&
547 verify_uptodate_sparse(ce
, o
)) {
548 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
551 ce
->ce_flags
|= CE_WT_REMOVE
;
552 ce
->ce_flags
&= ~CE_UPDATE
;
554 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
555 if (verify_absent_sparse(ce
, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
, o
))
557 ce
->ce_flags
|= CE_UPDATE
;
562 static int warn_conflicted_path(struct index_state
*istate
,
564 struct unpack_trees_options
*o
)
566 char *conflicting_path
= istate
->cache
[i
]->name
;
569 add_rejected_path(o
, WARNING_SPARSE_UNMERGED_FILE
, conflicting_path
);
571 /* Find out how many higher stage entries are at same path */
572 while ((++count
) + i
< istate
->cache_nr
&&
573 !strcmp(conflicting_path
, istate
->cache
[count
+ i
]->name
))
579 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
580 struct unpack_trees_options
*o
)
582 int ret
= o
->fn(src
, o
);
588 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
590 ce
->ce_flags
|= CE_UNPACKED
;
593 * If this is a sparse directory, don't advance cache_bottom.
594 * That will be advanced later using the cache-tree data.
596 if (S_ISSPARSEDIR(ce
->ce_mode
))
599 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
600 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
601 int bottom
= o
->cache_bottom
;
602 while (bottom
< o
->src_index
->cache_nr
&&
603 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
605 o
->cache_bottom
= bottom
;
609 static void mark_all_ce_unused(struct index_state
*index
)
612 for (i
= 0; i
< index
->cache_nr
; i
++)
613 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
616 static int locate_in_src_index(const struct cache_entry
*ce
,
617 struct unpack_trees_options
*o
)
619 struct index_state
*index
= o
->src_index
;
620 int len
= ce_namelen(ce
);
621 int pos
= index_name_pos(index
, ce
->name
, len
);
628 * We call unpack_index_entry() with an unmerged cache entry
629 * only in diff-index, and it wants a single callback. Skip
630 * the other unmerged entry with the same name.
632 static void mark_ce_used_same_name(struct cache_entry
*ce
,
633 struct unpack_trees_options
*o
)
635 struct index_state
*index
= o
->src_index
;
636 int len
= ce_namelen(ce
);
639 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
640 struct cache_entry
*next
= index
->cache
[pos
];
641 if (len
!= ce_namelen(next
) ||
642 memcmp(ce
->name
, next
->name
, len
))
644 mark_ce_used(next
, o
);
648 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
650 const struct index_state
*index
= o
->src_index
;
651 int pos
= o
->cache_bottom
;
653 while (pos
< index
->cache_nr
) {
654 struct cache_entry
*ce
= index
->cache
[pos
];
655 if (!(ce
->ce_flags
& CE_UNPACKED
))
662 static void add_same_unmerged(const struct cache_entry
*ce
,
663 struct unpack_trees_options
*o
)
665 struct index_state
*index
= o
->src_index
;
666 int len
= ce_namelen(ce
);
667 int pos
= index_name_pos(index
, ce
->name
, len
);
670 die("programming error in a caller of mark_ce_used_same_name");
671 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
672 struct cache_entry
*next
= index
->cache
[pos
];
673 if (len
!= ce_namelen(next
) ||
674 memcmp(ce
->name
, next
->name
, len
))
676 add_entry(o
, next
, 0, 0);
677 mark_ce_used(next
, o
);
681 static int unpack_index_entry(struct cache_entry
*ce
,
682 struct unpack_trees_options
*o
)
684 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
691 if (o
->skip_unmerged
) {
692 add_entry(o
, ce
, 0, 0);
696 ret
= call_unpack_fn(src
, o
);
698 mark_ce_used_same_name(ce
, o
);
702 static int find_cache_pos(struct traverse_info
*, const char *p
, size_t len
);
704 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
706 struct unpack_trees_options
*o
= info
->data
;
708 if (o
->diff_index_cached
)
710 o
->cache_bottom
= bottom
;
713 static int switch_cache_bottom(struct traverse_info
*info
)
715 struct unpack_trees_options
*o
= info
->data
;
718 if (o
->diff_index_cached
)
720 ret
= o
->cache_bottom
;
721 pos
= find_cache_pos(info
->prev
, info
->name
, info
->namelen
);
724 o
->cache_bottom
= -2 - pos
;
726 o
->cache_bottom
= o
->src_index
->cache_nr
;
730 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
732 return !is_null_oid(&name_j
->oid
) && !is_null_oid(&name_k
->oid
) && oideq(&name_j
->oid
, &name_k
->oid
);
735 static int all_trees_same_as_cache_tree(int n
, unsigned long dirmask
,
736 struct name_entry
*names
,
737 struct traverse_info
*info
)
739 struct unpack_trees_options
*o
= info
->data
;
742 if (!o
->merge
|| dirmask
!= ((1 << n
) - 1))
745 for (i
= 1; i
< n
; i
++)
746 if (!are_same_oid(names
, names
+ i
))
749 return cache_tree_matches_traversal(o
->src_index
->cache_tree
, names
, info
);
752 static int index_pos_by_traverse_info(struct name_entry
*names
,
753 struct traverse_info
*info
)
755 struct unpack_trees_options
*o
= info
->data
;
756 struct strbuf name
= STRBUF_INIT
;
759 strbuf_make_traverse_path(&name
, info
, names
->path
, names
->pathlen
);
760 strbuf_addch(&name
, '/');
761 pos
= index_name_pos(o
->src_index
, name
.buf
, name
.len
);
763 if (!o
->src_index
->sparse_index
||
764 !(o
->src_index
->cache
[pos
]->ce_flags
& CE_SKIP_WORKTREE
))
765 BUG("This is a directory and should not exist in index");
769 if (pos
>= o
->src_index
->cache_nr
||
770 !starts_with(o
->src_index
->cache
[pos
]->name
, name
.buf
) ||
771 (pos
> 0 && starts_with(o
->src_index
->cache
[pos
-1]->name
, name
.buf
)))
772 BUG("pos %d doesn't point to the first entry of %s in index",
774 strbuf_release(&name
);
779 * Fast path if we detect that all trees are the same as cache-tree at this
780 * path. We'll walk these trees in an iterative loop using cache-tree/index
781 * instead of ODB since we already know what these trees contain.
783 static int traverse_by_cache_tree(int pos
, int nr_entries
, int nr_names
,
784 struct traverse_info
*info
)
786 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
787 struct unpack_trees_options
*o
= info
->data
;
788 struct cache_entry
*tree_ce
= NULL
;
793 BUG("We need cache-tree to do this optimization");
796 * Do what unpack_callback() and unpack_single_entry() normally
797 * do. But we walk all paths in an iterative loop instead.
799 * D/F conflicts and higher stage entries are not a concern
800 * because cache-tree would be invalidated and we would never
801 * get here in the first place.
803 for (i
= 0; i
< nr_entries
; i
++) {
804 int new_ce_len
, len
, rc
;
806 src
[0] = o
->src_index
->cache
[pos
+ i
];
808 len
= ce_namelen(src
[0]);
809 new_ce_len
= cache_entry_size(len
);
811 if (new_ce_len
> ce_len
) {
813 tree_ce
= xrealloc(tree_ce
, new_ce_len
);
814 memset(tree_ce
, 0, new_ce_len
);
817 tree_ce
->ce_flags
= create_ce_flags(0);
819 for (d
= 1; d
<= nr_names
; d
++)
823 tree_ce
->ce_mode
= src
[0]->ce_mode
;
824 tree_ce
->ce_namelen
= len
;
825 oidcpy(&tree_ce
->oid
, &src
[0]->oid
);
826 memcpy(tree_ce
->name
, src
[0]->name
, len
+ 1);
828 rc
= call_unpack_fn((const struct cache_entry
* const *)src
, o
);
834 mark_ce_used(src
[0], o
);
838 printf("Unpacked %d entries from %s to %s using cache-tree\n",
840 o
->src_index
->cache
[pos
]->name
,
841 o
->src_index
->cache
[pos
+ nr_entries
- 1]->name
);
845 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
846 unsigned long df_conflicts
,
847 struct name_entry
*names
,
848 struct traverse_info
*info
)
850 struct unpack_trees_options
*o
= info
->data
;
853 struct tree_desc t
[MAX_UNPACK_TREES
];
854 void *buf
[MAX_UNPACK_TREES
];
855 struct traverse_info newinfo
;
856 struct name_entry
*p
;
859 nr_entries
= all_trees_same_as_cache_tree(n
, dirmask
, names
, info
);
860 if (nr_entries
> 0) {
861 int pos
= index_pos_by_traverse_info(names
, info
);
863 if (!o
->merge
|| df_conflicts
)
864 BUG("Wrong condition to get here buddy");
867 * All entries up to 'pos' must have been processed
868 * (i.e. marked CE_UNPACKED) at this point. But to be safe,
869 * save and restore cache_bottom anyway to not miss
870 * unprocessed entries before 'pos'.
872 bottom
= o
->cache_bottom
;
873 ret
= traverse_by_cache_tree(pos
, nr_entries
, n
, info
);
874 o
->cache_bottom
= bottom
;
884 newinfo
.pathspec
= info
->pathspec
;
885 newinfo
.name
= p
->path
;
886 newinfo
.namelen
= p
->pathlen
;
887 newinfo
.mode
= p
->mode
;
888 newinfo
.pathlen
= st_add3(newinfo
.pathlen
, tree_entry_len(p
), 1);
889 newinfo
.df_conflicts
|= df_conflicts
;
892 * Fetch the tree from the ODB for each peer directory in the
895 * For 2- and 3-way traversals, we try to avoid hitting the
896 * ODB twice for the same OID. This should yield a nice speed
897 * up in checkouts and merges when the commits are similar.
899 * We don't bother doing the full O(n^2) search for larger n,
900 * because wider traversals don't happen that often and we
901 * avoid the search setup.
903 * When 2 peer OIDs are the same, we just copy the tree
904 * descriptor data. This implicitly borrows the buffer
905 * data from the earlier cell.
907 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
908 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
910 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
913 const struct object_id
*oid
= NULL
;
916 buf
[nr_buf
++] = fill_tree_descriptor(the_repository
, t
+ i
, oid
);
920 bottom
= switch_cache_bottom(&newinfo
);
921 ret
= traverse_trees(o
->src_index
, n
, t
, &newinfo
);
922 restore_cache_bottom(&newinfo
, bottom
);
924 for (i
= 0; i
< nr_buf
; i
++)
931 * Compare the traverse-path to the cache entry without actually
932 * having to generate the textual representation of the traverse
935 * NOTE! This *only* compares up to the size of the traverse path
936 * itself - the caller needs to do the final check for the cache
937 * entry having more data at the end!
939 static int do_compare_entry_piecewise(const struct cache_entry
*ce
,
940 const struct traverse_info
*info
,
941 const char *name
, size_t namelen
,
948 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
949 info
->name
, info
->namelen
,
954 pathlen
= info
->pathlen
;
955 ce_len
= ce_namelen(ce
);
957 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
958 if (ce_len
< pathlen
)
962 ce_name
= ce
->name
+ pathlen
;
964 return df_name_compare(ce_name
, ce_len
, S_IFREG
, name
, namelen
, mode
);
967 static int do_compare_entry(const struct cache_entry
*ce
,
968 const struct traverse_info
*info
,
969 const char *name
, size_t namelen
,
978 * If we have not precomputed the traverse path, it is quicker
979 * to avoid doing so. But if we have precomputed it,
980 * it is quicker to use the precomputed version.
982 if (!info
->traverse_path
)
983 return do_compare_entry_piecewise(ce
, info
, name
, namelen
, mode
);
985 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
989 pathlen
= info
->pathlen
;
990 ce_len
= ce_namelen(ce
);
992 if (ce_len
< pathlen
)
996 ce_name
= ce
->name
+ pathlen
;
998 ce_mode
= S_ISSPARSEDIR(ce
->ce_mode
) ? S_IFDIR
: S_IFREG
;
999 return df_name_compare(ce_name
, ce_len
, ce_mode
, name
, namelen
, mode
);
1002 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
1004 int cmp
= do_compare_entry(ce
, info
, n
->path
, n
->pathlen
, n
->mode
);
1009 * At this point, we know that we have a prefix match. If ce
1010 * is a sparse directory, then allow an exact match. This only
1011 * works when the input name is a directory, since ce->name
1012 * ends in a directory separator.
1014 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
1015 ce
->ce_namelen
== traverse_path_len(info
, tree_entry_len(n
)) + 1)
1019 * Even if the beginning compared identically, the ce should
1020 * compare as bigger than a directory leading up to it!
1022 return ce_namelen(ce
) > traverse_path_len(info
, tree_entry_len(n
));
1025 static int ce_in_traverse_path(const struct cache_entry
*ce
,
1026 const struct traverse_info
*info
)
1030 if (do_compare_entry(ce
, info
->prev
,
1031 info
->name
, info
->namelen
, info
->mode
))
1034 * If ce (blob) is the same name as the path (which is a tree
1035 * we will be descending into), it won't be inside it.
1037 return (info
->pathlen
< ce_namelen(ce
));
1040 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
,
1041 const struct name_entry
*n
,
1043 struct index_state
*istate
,
1045 int is_sparse_directory
)
1047 size_t len
= traverse_path_len(info
, tree_entry_len(n
));
1048 size_t alloc_len
= is_sparse_directory
? len
+ 1 : len
;
1049 struct cache_entry
*ce
=
1051 make_empty_transient_cache_entry(alloc_len
, NULL
) :
1052 make_empty_cache_entry(istate
, alloc_len
);
1054 ce
->ce_mode
= create_ce_mode(n
->mode
);
1055 ce
->ce_flags
= create_ce_flags(stage
);
1056 ce
->ce_namelen
= len
;
1057 oidcpy(&ce
->oid
, &n
->oid
);
1058 /* len+1 because the cache_entry allocates space for NUL */
1059 make_traverse_path(ce
->name
, len
+ 1, info
, n
->path
, n
->pathlen
);
1061 if (is_sparse_directory
) {
1062 ce
->name
[len
] = '/';
1063 ce
->name
[len
+ 1] = '\0';
1065 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
1072 * Note that traverse_by_cache_tree() duplicates some logic in this function
1073 * without actually calling it. If you change the logic here you may need to
1074 * check and change there as well.
1076 static int unpack_single_entry(int n
, unsigned long mask
,
1077 unsigned long dirmask
,
1078 struct cache_entry
**src
,
1079 const struct name_entry
*names
,
1080 const struct traverse_info
*info
)
1083 struct unpack_trees_options
*o
= info
->data
;
1084 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
1086 if (mask
== dirmask
&& !src
[0])
1090 * When we have a sparse directory entry for src[0],
1091 * then this isn't necessarily a directory-file conflict.
1093 if (mask
== dirmask
&& src
[0] &&
1094 S_ISSPARSEDIR(src
[0]->ce_mode
))
1098 * Ok, we've filled in up to any potential index entry in src[0],
1101 for (i
= 0; i
< n
; i
++) {
1103 unsigned int bit
= 1ul << i
;
1104 if (conflicts
& bit
) {
1105 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
1112 else if (i
+ 1 < o
->head_idx
)
1114 else if (i
+ 1 > o
->head_idx
)
1120 * If the merge bit is set, then the cache entries are
1121 * discarded in the following block. In this case,
1122 * construct "transient" cache_entries, as they are
1123 * not stored in the index. otherwise construct the
1124 * cache entry from the index aware logic.
1126 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
,
1127 &o
->result
, o
->merge
,
1132 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
1134 for (i
= 0; i
< n
; i
++) {
1135 struct cache_entry
*ce
= src
[i
+ o
->merge
];
1136 if (ce
!= o
->df_conflict_entry
)
1137 discard_cache_entry(ce
);
1142 for (i
= 0; i
< n
; i
++)
1143 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
1144 if (do_add_entry(o
, src
[i
], 0, 0))
1150 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
1152 discard_index(&o
->result
);
1153 if (!o
->quiet
&& !o
->exiting_early
) {
1155 return error("%s", message
);
1162 * The tree traversal is looking at name p. If we have a matching entry,
1163 * return it. If name p is a directory in the index, do not return
1164 * anything, as we will want to match it when the traversal descends into
1167 static int find_cache_pos(struct traverse_info
*info
,
1168 const char *p
, size_t p_len
)
1171 struct unpack_trees_options
*o
= info
->data
;
1172 struct index_state
*index
= o
->src_index
;
1173 int pfxlen
= info
->pathlen
;
1175 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
1176 const struct cache_entry
*ce
= index
->cache
[pos
];
1177 const char *ce_name
, *ce_slash
;
1180 if (ce
->ce_flags
& CE_UNPACKED
) {
1182 * cache_bottom entry is already unpacked, so
1183 * we can never match it; don't check it
1186 if (pos
== o
->cache_bottom
)
1190 if (!ce_in_traverse_path(ce
, info
)) {
1192 * Check if we can skip future cache checks
1193 * (because we're already past all possible
1194 * entries in the traverse path).
1196 if (info
->traverse_path
) {
1197 if (strncmp(ce
->name
, info
->traverse_path
,
1203 ce_name
= ce
->name
+ pfxlen
;
1204 ce_slash
= strchr(ce_name
, '/');
1206 ce_len
= ce_slash
- ce_name
;
1208 ce_len
= ce_namelen(ce
) - pfxlen
;
1209 cmp
= name_compare(p
, p_len
, ce_name
, ce_len
);
1211 * Exact match; if we have a directory we need to
1212 * delay returning it.
1215 return ce_slash
? -2 - pos
: pos
;
1217 continue; /* keep looking */
1219 * ce_name sorts after p->path; could it be that we
1220 * have files under p->path directory in the index?
1221 * E.g. ce_name == "t-i", and p->path == "t"; we may
1222 * have "t/a" in the index.
1224 if (p_len
< ce_len
&& !memcmp(ce_name
, p
, p_len
) &&
1225 ce_name
[p_len
] < '/')
1226 continue; /* keep looking */
1233 * Given a sparse directory entry 'ce', compare ce->name to
1234 * info->name + '/' + p->path + '/' if info->name is non-empty.
1235 * Compare ce->name to p->path + '/' otherwise. Note that
1236 * ce->name must end in a trailing '/' because it is a sparse
1239 static int sparse_dir_matches_path(const struct cache_entry
*ce
,
1240 struct traverse_info
*info
,
1241 const struct name_entry
*p
)
1243 assert(S_ISSPARSEDIR(ce
->ce_mode
));
1244 assert(ce
->name
[ce
->ce_namelen
- 1] == '/');
1247 return ce
->ce_namelen
== info
->namelen
+ p
->pathlen
+ 2 &&
1248 ce
->name
[info
->namelen
] == '/' &&
1249 !strncmp(ce
->name
, info
->name
, info
->namelen
) &&
1250 !strncmp(ce
->name
+ info
->namelen
+ 1, p
->path
, p
->pathlen
);
1251 return ce
->ce_namelen
== p
->pathlen
+ 1 &&
1252 !strncmp(ce
->name
, p
->path
, p
->pathlen
);
1255 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
1256 const struct name_entry
*p
)
1258 struct cache_entry
*ce
;
1259 int pos
= find_cache_pos(info
, p
->path
, p
->pathlen
);
1260 struct unpack_trees_options
*o
= info
->data
;
1263 return o
->src_index
->cache
[pos
];
1266 * Check for a sparse-directory entry named "path/".
1267 * Due to the input p->path not having a trailing
1268 * slash, the negative 'pos' value overshoots the
1269 * expected position, hence "-2" instead of "-1".
1273 if (pos
< 0 || pos
>= o
->src_index
->cache_nr
)
1277 * Due to lexicographic sorting and sparse directory
1278 * entries ending with a trailing slash, our path as a
1279 * sparse directory (e.g "subdir/") and our path as a
1280 * file (e.g. "subdir") might be separated by other
1281 * paths (e.g. "subdir-").
1284 ce
= o
->src_index
->cache
[pos
];
1286 if (strncmp(ce
->name
, p
->path
, p
->pathlen
))
1289 if (S_ISSPARSEDIR(ce
->ce_mode
) &&
1290 sparse_dir_matches_path(ce
, info
, p
))
1299 static void debug_path(struct traverse_info
*info
)
1302 debug_path(info
->prev
);
1303 if (*info
->prev
->name
)
1306 printf("%s", info
->name
);
1309 static void debug_name_entry(int i
, struct name_entry
*n
)
1311 printf("ent#%d %06o %s\n", i
,
1312 n
->path
? n
->mode
: 0,
1313 n
->path
? n
->path
: "(missing)");
1316 static void debug_unpack_callback(int n
,
1318 unsigned long dirmask
,
1319 struct name_entry
*names
,
1320 struct traverse_info
*info
)
1323 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
1327 for (i
= 0; i
< n
; i
++)
1328 debug_name_entry(i
, names
+ i
);
1332 * Returns true if and only if the given cache_entry is a
1333 * sparse-directory entry that matches the given name_entry
1334 * from the tree walk at the given traverse_info.
1336 static int is_sparse_directory_entry(struct cache_entry
*ce
,
1337 struct name_entry
*name
,
1338 struct traverse_info
*info
)
1340 if (!ce
|| !name
|| !S_ISSPARSEDIR(ce
->ce_mode
))
1343 return sparse_dir_matches_path(ce
, info
, name
);
1347 * Note that traverse_by_cache_tree() duplicates some logic in this function
1348 * without actually calling it. If you change the logic here you may need to
1349 * check and change there as well.
1351 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
1353 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
1354 struct unpack_trees_options
*o
= info
->data
;
1355 const struct name_entry
*p
= names
;
1357 /* Find first entry with a real name (we could use "mask" too) */
1361 if (o
->debug_unpack
)
1362 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
1364 /* Are we supposed to look at the index too? */
1368 struct cache_entry
*ce
;
1370 if (o
->diff_index_cached
)
1371 ce
= next_cache_entry(o
);
1373 ce
= find_cache_entry(info
, p
);
1377 cmp
= compare_entry(ce
, info
, p
);
1379 if (unpack_index_entry(ce
, o
) < 0)
1380 return unpack_failed(o
, NULL
);
1386 * If we skip unmerged index
1387 * entries, we'll skip this
1388 * entry *and* the tree
1389 * entries associated with it!
1391 if (o
->skip_unmerged
) {
1392 add_same_unmerged(ce
, o
);
1402 if (unpack_single_entry(n
, mask
, dirmask
, src
, names
, info
) < 0)
1405 if (o
->merge
&& src
[0]) {
1406 if (ce_stage(src
[0]))
1407 mark_ce_used_same_name(src
[0], o
);
1409 mark_ce_used(src
[0], o
);
1412 /* Now handle any directories.. */
1414 /* special case: "diff-index --cached" looking at a tree */
1415 if (o
->diff_index_cached
&&
1416 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1418 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1421 * Everything under the name matches; skip the
1422 * entire hierarchy. diff_index_cached codepath
1423 * special cases D/F conflicts in such a way that
1424 * it does not do any look-ahead, so this is safe.
1427 o
->cache_bottom
+= matches
;
1432 if (!is_sparse_directory_entry(src
[0], names
, info
) &&
1433 traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1444 static int clear_ce_flags_1(struct index_state
*istate
,
1445 struct cache_entry
**cache
, int nr
,
1446 struct strbuf
*prefix
,
1447 int select_mask
, int clear_mask
,
1448 struct pattern_list
*pl
,
1449 enum pattern_match_result default_match
,
1452 /* Whole directory matching */
1453 static int clear_ce_flags_dir(struct index_state
*istate
,
1454 struct cache_entry
**cache
, int nr
,
1455 struct strbuf
*prefix
,
1457 int select_mask
, int clear_mask
,
1458 struct pattern_list
*pl
,
1459 enum pattern_match_result default_match
,
1462 struct cache_entry
**cache_end
;
1465 enum pattern_match_result ret
, orig_ret
;
1466 orig_ret
= path_matches_pattern_list(prefix
->buf
, prefix
->len
,
1467 basename
, &dtype
, pl
, istate
);
1469 strbuf_addch(prefix
, '/');
1471 /* If undecided, use matching result of parent dir in defval */
1472 if (orig_ret
== UNDECIDED
)
1473 ret
= default_match
;
1477 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1478 struct cache_entry
*ce
= *cache_end
;
1479 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1483 if (pl
->use_cone_patterns
&& orig_ret
== MATCHED_RECURSIVE
) {
1484 struct cache_entry
**ce
= cache
;
1485 rc
= cache_end
- cache
;
1487 while (ce
< cache_end
) {
1488 (*ce
)->ce_flags
&= ~clear_mask
;
1491 } else if (pl
->use_cone_patterns
&& orig_ret
== NOT_MATCHED
) {
1492 rc
= cache_end
- cache
;
1494 rc
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1496 select_mask
, clear_mask
,
1501 strbuf_setlen(prefix
, prefix
->len
- 1);
1506 * Traverse the index, find every entry that matches according to
1507 * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the
1508 * number of traversed entries.
1510 * If select_mask is non-zero, only entries whose ce_flags has on of
1511 * those bits enabled are traversed.
1513 * cache : pointer to an index entry
1514 * prefix_len : an offset to its path
1516 * The current path ("prefix") including the trailing '/' is
1517 * cache[0]->name[0..(prefix_len-1)]
1518 * Top level path has prefix_len zero.
1520 static int clear_ce_flags_1(struct index_state
*istate
,
1521 struct cache_entry
**cache
, int nr
,
1522 struct strbuf
*prefix
,
1523 int select_mask
, int clear_mask
,
1524 struct pattern_list
*pl
,
1525 enum pattern_match_result default_match
,
1528 struct cache_entry
**cache_end
= nr
? cache
+ nr
: cache
;
1531 * Process all entries that have the given prefix and meet
1532 * select_mask condition
1534 while(cache
!= cache_end
) {
1535 struct cache_entry
*ce
= *cache
;
1536 const char *name
, *slash
;
1538 enum pattern_match_result ret
;
1540 display_progress(istate
->progress
, progress_nr
);
1542 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1548 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1551 name
= ce
->name
+ prefix
->len
;
1552 slash
= strchr(name
, '/');
1554 /* If it's a directory, try whole directory match first */
1559 strbuf_add(prefix
, name
, len
);
1561 processed
= clear_ce_flags_dir(istate
, cache
, cache_end
- cache
,
1563 prefix
->buf
+ prefix
->len
- len
,
1564 select_mask
, clear_mask
,
1568 /* clear_c_f_dir eats a whole dir already? */
1571 progress_nr
+= processed
;
1572 strbuf_setlen(prefix
, prefix
->len
- len
);
1576 strbuf_addch(prefix
, '/');
1577 processed
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1579 select_mask
, clear_mask
, pl
,
1580 default_match
, progress_nr
);
1583 progress_nr
+= processed
;
1585 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1590 dtype
= ce_to_dtype(ce
);
1591 ret
= path_matches_pattern_list(ce
->name
,
1593 name
, &dtype
, pl
, istate
);
1594 if (ret
== UNDECIDED
)
1595 ret
= default_match
;
1596 if (ret
== MATCHED
|| ret
== MATCHED_RECURSIVE
)
1597 ce
->ce_flags
&= ~clear_mask
;
1602 display_progress(istate
->progress
, progress_nr
);
1603 return nr
- (cache_end
- cache
);
1606 static int clear_ce_flags(struct index_state
*istate
,
1607 int select_mask
, int clear_mask
,
1608 struct pattern_list
*pl
,
1611 static struct strbuf prefix
= STRBUF_INIT
;
1615 strbuf_reset(&prefix
);
1617 istate
->progress
= start_delayed_progress(
1618 _("Updating index flags"),
1621 xsnprintf(label
, sizeof(label
), "clear_ce_flags(0x%08lx,0x%08lx)",
1622 (unsigned long)select_mask
, (unsigned long)clear_mask
);
1623 trace2_region_enter("unpack_trees", label
, the_repository
);
1624 rval
= clear_ce_flags_1(istate
,
1628 select_mask
, clear_mask
,
1630 trace2_region_leave("unpack_trees", label
, the_repository
);
1632 stop_progress(&istate
->progress
);
1637 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1639 static void mark_new_skip_worktree(struct pattern_list
*pl
,
1640 struct index_state
*istate
,
1641 int select_flag
, int skip_wt_flag
,
1647 * 1. Pretend the narrowest worktree: only unmerged entries
1650 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1651 struct cache_entry
*ce
= istate
->cache
[i
];
1653 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1656 if (!ce_stage(ce
) && !(ce
->ce_flags
& CE_CONFLICTED
))
1657 ce
->ce_flags
|= skip_wt_flag
;
1659 ce
->ce_flags
&= ~skip_wt_flag
;
1663 * 2. Widen worktree according to sparse-checkout file.
1664 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1666 clear_ce_flags(istate
, select_flag
, skip_wt_flag
, pl
, show_progress
);
1669 static void populate_from_existing_patterns(struct unpack_trees_options
*o
,
1670 struct pattern_list
*pl
)
1672 if (get_sparse_checkout_patterns(pl
) < 0)
1673 o
->skip_sparse_checkout
= 1;
1679 static int verify_absent(const struct cache_entry
*,
1680 enum unpack_trees_error_types
,
1681 struct unpack_trees_options
*);
1683 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1684 * resulting index, -2 on failure to reflect the changes to the work tree.
1686 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1688 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1690 struct repository
*repo
= the_repository
;
1692 static struct cache_entry
*dfc
;
1693 struct pattern_list pl
;
1694 int free_pattern_list
= 0;
1695 struct dir_struct dir
= DIR_INIT
;
1697 if (o
->reset
== UNPACK_RESET_INVALID
)
1698 BUG("o->reset had a value of 1; should be UNPACK_TREES_*_UNTRACKED");
1700 if (len
> MAX_UNPACK_TREES
)
1701 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1703 BUG("o->dir is for internal use only");
1705 trace_performance_enter();
1706 trace2_region_enter("unpack_trees", "unpack_trees", the_repository
);
1708 prepare_repo_settings(repo
);
1709 if (repo
->settings
.command_requires_full_index
) {
1710 ensure_full_index(o
->src_index
);
1711 ensure_full_index(o
->dst_index
);
1714 if (o
->reset
== UNPACK_RESET_OVERWRITE_UNTRACKED
&&
1715 o
->preserve_ignored
)
1716 BUG("UNPACK_RESET_OVERWRITE_UNTRACKED incompatible with preserved ignored files");
1718 if (!o
->preserve_ignored
) {
1720 o
->dir
->flags
|= DIR_SHOW_IGNORED
;
1721 setup_standard_excludes(o
->dir
);
1724 if (!core_apply_sparse_checkout
|| !o
->update
)
1725 o
->skip_sparse_checkout
= 1;
1726 if (!o
->skip_sparse_checkout
&& !o
->pl
) {
1727 memset(&pl
, 0, sizeof(pl
));
1728 free_pattern_list
= 1;
1729 populate_from_existing_patterns(o
, &pl
);
1732 memset(&o
->result
, 0, sizeof(o
->result
));
1733 o
->result
.initialized
= 1;
1734 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1735 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1736 o
->result
.version
= o
->src_index
->version
;
1737 if (!o
->src_index
->split_index
) {
1738 o
->result
.split_index
= NULL
;
1739 } else if (o
->src_index
== o
->dst_index
) {
1741 * o->dst_index (and thus o->src_index) will be discarded
1742 * and overwritten with o->result at the end of this function,
1743 * so just use src_index's split_index to avoid having to
1746 o
->result
.split_index
= o
->src_index
->split_index
;
1747 o
->result
.split_index
->refcount
++;
1749 o
->result
.split_index
= init_split_index(&o
->result
);
1751 oidcpy(&o
->result
.oid
, &o
->src_index
->oid
);
1752 o
->merge_size
= len
;
1753 mark_all_ce_unused(o
->src_index
);
1755 o
->result
.fsmonitor_last_update
=
1756 xstrdup_or_null(o
->src_index
->fsmonitor_last_update
);
1759 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1761 if (!o
->skip_sparse_checkout
)
1762 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1763 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1766 dfc
= xcalloc(1, cache_entry_size(0));
1767 o
->df_conflict_entry
= dfc
;
1770 const char *prefix
= o
->prefix
? o
->prefix
: "";
1771 struct traverse_info info
;
1773 setup_traverse_info(&info
, prefix
);
1774 info
.fn
= unpack_callback
;
1776 info
.show_all_errors
= o
->show_all_errors
;
1777 info
.pathspec
= o
->pathspec
;
1781 * Unpack existing index entries that sort before the
1782 * prefix the tree is spliced into. Note that o->merge
1783 * is always true in this case.
1786 struct cache_entry
*ce
= next_cache_entry(o
);
1789 if (ce_in_traverse_path(ce
, &info
))
1791 if (unpack_index_entry(ce
, o
) < 0)
1796 trace_performance_enter();
1797 trace2_region_enter("unpack_trees", "traverse_trees", the_repository
);
1798 ret
= traverse_trees(o
->src_index
, len
, t
, &info
);
1799 trace2_region_leave("unpack_trees", "traverse_trees", the_repository
);
1800 trace_performance_leave("traverse_trees");
1805 /* Any left-over entries in the index? */
1808 struct cache_entry
*ce
= next_cache_entry(o
);
1811 if (unpack_index_entry(ce
, o
) < 0)
1815 mark_all_ce_unused(o
->src_index
);
1817 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1818 ret
= unpack_failed(o
, "Merge requires file-level merging");
1822 if (!o
->skip_sparse_checkout
) {
1824 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1825 * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1826 * so apply_sparse_checkout() won't attempt to remove it from worktree
1828 mark_new_skip_worktree(o
->pl
, &o
->result
,
1829 CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
,
1833 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1834 struct cache_entry
*ce
= o
->result
.cache
[i
];
1837 * Entries marked with CE_ADDED in merged_entry() do not have
1838 * verify_absent() check (the check is effectively disabled
1839 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1841 * Do the real check now because we have had
1842 * correct CE_NEW_SKIP_WORKTREE
1844 if (ce
->ce_flags
& CE_ADDED
&&
1845 verify_absent(ce
, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
, o
))
1848 if (apply_sparse_checkout(&o
->result
, ce
, o
))
1853 * Inability to sparsify or de-sparsify individual
1854 * paths is not an error, but just a warning.
1856 if (o
->show_all_errors
)
1857 display_warning_msgs(o
);
1862 ret
= check_updates(o
, &o
->result
) ? (-2) : 0;
1864 move_index_extensions(&o
->result
, o
->src_index
);
1866 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
1867 cache_tree_verify(the_repository
, &o
->result
);
1868 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1869 cache_tree_update(&o
->result
,
1874 o
->result
.updated_workdir
= 1;
1875 discard_index(o
->dst_index
);
1876 *o
->dst_index
= o
->result
;
1878 discard_index(&o
->result
);
1880 o
->src_index
= NULL
;
1883 if (free_pattern_list
)
1884 clear_pattern_list(&pl
);
1889 trace2_region_leave("unpack_trees", "unpack_trees", the_repository
);
1890 trace_performance_leave("unpack_trees");
1894 if (o
->show_all_errors
)
1895 display_error_msgs(o
);
1896 mark_all_ce_unused(o
->src_index
);
1897 ret
= unpack_failed(o
, NULL
);
1898 if (o
->exiting_early
)
1904 * Update SKIP_WORKTREE bits according to sparsity patterns, and update
1905 * working directory to match.
1907 * CE_NEW_SKIP_WORKTREE is used internally.
1909 enum update_sparsity_result
update_sparsity(struct unpack_trees_options
*o
)
1911 enum update_sparsity_result ret
= UPDATE_SPARSITY_SUCCESS
;
1912 struct pattern_list pl
;
1914 unsigned old_show_all_errors
;
1915 int free_pattern_list
= 0;
1917 old_show_all_errors
= o
->show_all_errors
;
1918 o
->show_all_errors
= 1;
1921 if (!o
->update
|| o
->index_only
|| o
->skip_sparse_checkout
)
1922 BUG("update_sparsity() is for reflecting sparsity patterns in working directory");
1923 if (o
->src_index
!= o
->dst_index
|| o
->fn
)
1924 BUG("update_sparsity() called wrong");
1926 trace_performance_enter();
1928 /* If we weren't given patterns, use the recorded ones */
1930 memset(&pl
, 0, sizeof(pl
));
1931 free_pattern_list
= 1;
1932 populate_from_existing_patterns(o
, &pl
);
1933 if (o
->skip_sparse_checkout
)
1934 goto skip_sparse_checkout
;
1937 /* Set NEW_SKIP_WORKTREE on existing entries. */
1938 mark_all_ce_unused(o
->src_index
);
1939 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1940 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1942 /* Then loop over entries and update/remove as needed */
1943 ret
= UPDATE_SPARSITY_SUCCESS
;
1944 for (i
= 0; i
< o
->src_index
->cache_nr
; i
++) {
1945 struct cache_entry
*ce
= o
->src_index
->cache
[i
];
1949 /* -1 because for loop will increment by 1 */
1950 i
+= warn_conflicted_path(o
->src_index
, i
, o
) - 1;
1951 ret
= UPDATE_SPARSITY_WARNINGS
;
1955 if (apply_sparse_checkout(o
->src_index
, ce
, o
))
1956 ret
= UPDATE_SPARSITY_WARNINGS
;
1959 skip_sparse_checkout
:
1960 if (check_updates(o
, o
->src_index
))
1961 ret
= UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES
;
1963 display_warning_msgs(o
);
1964 o
->show_all_errors
= old_show_all_errors
;
1965 if (free_pattern_list
)
1966 clear_pattern_list(&pl
);
1967 trace_performance_leave("update_sparsity");
1971 /* Here come the merge functions */
1973 static int reject_merge(const struct cache_entry
*ce
,
1974 struct unpack_trees_options
*o
)
1976 return add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1979 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1985 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1987 return a
->ce_mode
== b
->ce_mode
&&
1988 oideq(&a
->oid
, &b
->oid
);
1993 * When a CE gets turned into an unmerged entry, we
1994 * want it to be up-to-date
1996 static int verify_uptodate_1(const struct cache_entry
*ce
,
1997 struct unpack_trees_options
*o
,
1998 enum unpack_trees_error_types error_type
)
2006 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
2007 * if this entry is truly up-to-date because this file may be
2010 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
2011 ; /* keep checking */
2012 else if (o
->reset
|| ce_uptodate(ce
))
2015 if (!lstat(ce
->name
, &st
)) {
2016 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
2017 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
2019 if (submodule_from_ce(ce
)) {
2020 int r
= check_submodule_move_head(ce
,
2021 "HEAD", oid_to_hex(&ce
->oid
), o
);
2023 return add_rejected_path(o
, error_type
, ce
->name
);
2030 * Historic default policy was to allow submodule to be out
2031 * of sync wrt the superproject index. If the submodule was
2032 * not considered interesting above, we don't care here.
2034 if (S_ISGITLINK(ce
->ce_mode
))
2039 if (errno
== ENOENT
)
2041 return add_rejected_path(o
, error_type
, ce
->name
);
2044 int verify_uptodate(const struct cache_entry
*ce
,
2045 struct unpack_trees_options
*o
)
2047 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
2049 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
2052 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
2053 struct unpack_trees_options
*o
)
2055 return verify_uptodate_1(ce
, o
, WARNING_SPARSE_NOT_UPTODATE_FILE
);
2059 * TODO: We should actually invalidate o->result, not src_index [1].
2060 * But since cache tree and untracked cache both are not copied to
2061 * o->result until unpacking is complete, we invalidate them on
2062 * src_index instead with the assumption that they will be copied to
2063 * dst_index at the end.
2065 * [1] src_index->cache_tree is also used in unpack_callback() so if
2066 * we invalidate o->result, we need to update it to use
2067 * o->result.cache_tree as well.
2069 static void invalidate_ce_path(const struct cache_entry
*ce
,
2070 struct unpack_trees_options
*o
)
2074 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
2075 untracked_cache_invalidate_path(o
->src_index
, ce
->name
, 1);
2079 * Check that checking out ce->sha1 in subdir ce->name is not
2080 * going to overwrite any working files.
2082 static int verify_clean_submodule(const char *old_sha1
,
2083 const struct cache_entry
*ce
,
2084 struct unpack_trees_options
*o
)
2086 if (!submodule_from_ce(ce
))
2089 return check_submodule_move_head(ce
, old_sha1
,
2090 oid_to_hex(&ce
->oid
), o
);
2093 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
2094 struct unpack_trees_options
*o
)
2097 * we are about to extract "ce->name"; we would not want to lose
2098 * anything in the existing directory there.
2102 struct dir_struct d
;
2106 if (S_ISGITLINK(ce
->ce_mode
)) {
2107 struct object_id oid
;
2108 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", &oid
);
2110 * If we are not going to update the submodule, then
2113 if (!sub_head
&& oideq(&oid
, &ce
->oid
))
2115 return verify_clean_submodule(sub_head
? NULL
: oid_to_hex(&oid
),
2120 * First let's make sure we do not have a local modification
2121 * in that directory.
2123 namelen
= ce_namelen(ce
);
2124 for (i
= locate_in_src_index(ce
, o
);
2125 i
< o
->src_index
->cache_nr
;
2127 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
2128 int len
= ce_namelen(ce2
);
2129 if (len
< namelen
||
2130 strncmp(ce
->name
, ce2
->name
, namelen
) ||
2131 ce2
->name
[namelen
] != '/')
2134 * ce2->name is an entry in the subdirectory to be
2137 if (!ce_stage(ce2
)) {
2138 if (verify_uptodate(ce2
, o
))
2140 add_entry(o
, ce2
, CE_REMOVE
, 0);
2141 invalidate_ce_path(ce
, o
);
2142 mark_ce_used(ce2
, o
);
2148 * Then we need to make sure that we do not lose a locally
2149 * present file that is not ignored.
2151 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
2153 memset(&d
, 0, sizeof(d
));
2155 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
2156 i
= read_directory(&d
, o
->src_index
, pathbuf
, namelen
+1, NULL
);
2158 return add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
2164 * This gets called when there was no index entry for the tree entry 'dst',
2165 * but we found a file in the working tree that 'lstat()' said was fine,
2166 * and we're on a case-insensitive filesystem.
2168 * See if we can find a case-insensitive match in the index that also
2169 * matches the stat information, and assume it's that other file!
2171 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
2173 const struct cache_entry
*src
;
2175 src
= index_file_exists(o
->src_index
, name
, len
, 1);
2176 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
2179 enum absent_checking_type
{
2181 ABSENT_ANY_DIRECTORY
2184 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
2185 const struct cache_entry
*ce
, struct stat
*st
,
2186 enum unpack_trees_error_types error_type
,
2187 enum absent_checking_type absent_type
,
2188 struct unpack_trees_options
*o
)
2190 const struct cache_entry
*result
;
2193 * It may be that the 'lstat()' succeeded even though
2194 * target 'ce' was absent, because there is an old
2195 * entry that is different only in case..
2197 * Ignore that lstat() if it matches.
2199 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
2203 is_excluded(o
->dir
, o
->src_index
, name
, &dtype
))
2205 * ce->name is explicitly excluded, so it is Ok to
2209 if (S_ISDIR(st
->st_mode
)) {
2211 * We are checking out path "foo" and
2212 * found "foo/." in the working tree.
2213 * This is tricky -- if we have modified
2214 * files that are in "foo/" we would lose
2217 if (verify_clean_subdirectory(ce
, o
) < 0)
2222 /* If we only care about directories, then we can remove */
2223 if (absent_type
== ABSENT_ANY_DIRECTORY
)
2227 * The previous round may already have decided to
2228 * delete this path, which is in a subdirectory that
2229 * is being replaced with a blob.
2231 result
= index_file_exists(&o
->result
, name
, len
, 0);
2233 if (result
->ce_flags
& CE_REMOVE
)
2237 return add_rejected_path(o
, error_type
, name
);
2241 * We do not want to remove or overwrite a working tree file that
2242 * is not tracked, unless it is ignored.
2244 static int verify_absent_1(const struct cache_entry
*ce
,
2245 enum unpack_trees_error_types error_type
,
2246 enum absent_checking_type absent_type
,
2247 struct unpack_trees_options
*o
)
2252 if (o
->index_only
|| !o
->update
||
2253 o
->reset
== UNPACK_RESET_OVERWRITE_UNTRACKED
)
2256 len
= check_leading_path(ce
->name
, ce_namelen(ce
), 0);
2263 path
= xmemdupz(ce
->name
, len
);
2264 if (lstat(path
, &st
))
2265 ret
= error_errno("cannot stat '%s'", path
);
2267 if (submodule_from_ce(ce
))
2268 ret
= check_submodule_move_head(ce
,
2269 oid_to_hex(&ce
->oid
),
2272 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
2278 } else if (lstat(ce
->name
, &st
)) {
2279 if (errno
!= ENOENT
)
2280 return error_errno("cannot stat '%s'", ce
->name
);
2283 if (submodule_from_ce(ce
))
2284 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
2287 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
2288 ce_to_dtype(ce
), ce
, &st
,
2289 error_type
, absent_type
, o
);
2293 static int verify_absent(const struct cache_entry
*ce
,
2294 enum unpack_trees_error_types error_type
,
2295 struct unpack_trees_options
*o
)
2297 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
2299 return verify_absent_1(ce
, error_type
, COMPLETELY_ABSENT
, o
);
2302 static int verify_absent_if_directory(const struct cache_entry
*ce
,
2303 enum unpack_trees_error_types error_type
,
2304 struct unpack_trees_options
*o
)
2306 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
2308 return verify_absent_1(ce
, error_type
, ABSENT_ANY_DIRECTORY
, o
);
2311 static int verify_absent_sparse(const struct cache_entry
*ce
,
2312 enum unpack_trees_error_types error_type
,
2313 struct unpack_trees_options
*o
)
2315 return verify_absent_1(ce
, error_type
, COMPLETELY_ABSENT
, o
);
2318 static int merged_entry(const struct cache_entry
*ce
,
2319 const struct cache_entry
*old
,
2320 struct unpack_trees_options
*o
)
2322 int update
= CE_UPDATE
;
2323 struct cache_entry
*merge
= dup_cache_entry(ce
, &o
->result
);
2327 * New index entries. In sparse checkout, the following
2328 * verify_absent() will be delayed until after
2329 * traverse_trees() finishes in unpack_trees(), then:
2331 * - CE_NEW_SKIP_WORKTREE will be computed correctly
2332 * - verify_absent() be called again, this time with
2333 * correct CE_NEW_SKIP_WORKTREE
2335 * verify_absent() call here does nothing in sparse
2336 * checkout (i.e. o->skip_sparse_checkout == 0)
2339 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
2341 if (verify_absent(merge
,
2342 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
2343 discard_cache_entry(merge
);
2346 invalidate_ce_path(merge
, o
);
2348 if (submodule_from_ce(ce
) && file_exists(ce
->name
)) {
2349 int ret
= check_submodule_move_head(ce
, NULL
,
2350 oid_to_hex(&ce
->oid
),
2356 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
2358 * See if we can re-use the old CE directly?
2359 * That way we get the uptodate stat info.
2361 * This also removes the UPDATE flag on a match; otherwise
2362 * we will end up overwriting local changes in the work tree.
2364 if (same(old
, merge
)) {
2365 copy_cache_entry(merge
, old
);
2368 if (verify_uptodate(old
, o
)) {
2369 discard_cache_entry(merge
);
2372 /* Migrate old flags over */
2373 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
2374 invalidate_ce_path(old
, o
);
2377 if (submodule_from_ce(ce
) && file_exists(ce
->name
)) {
2378 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
2379 oid_to_hex(&ce
->oid
),
2386 * Previously unmerged entry left as an existence
2387 * marker by read_index_unmerged();
2389 if (verify_absent_if_directory(merge
,
2390 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
2391 discard_cache_entry(merge
);
2395 invalidate_ce_path(old
, o
);
2398 if (do_add_entry(o
, merge
, update
, CE_STAGEMASK
) < 0)
2403 static int deleted_entry(const struct cache_entry
*ce
,
2404 const struct cache_entry
*old
,
2405 struct unpack_trees_options
*o
)
2407 /* Did it exist in the index? */
2409 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2413 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
2415 add_entry(o
, ce
, CE_REMOVE
, 0);
2416 invalidate_ce_path(ce
, o
);
2420 static int keep_entry(const struct cache_entry
*ce
,
2421 struct unpack_trees_options
*o
)
2423 add_entry(o
, ce
, 0, 0);
2425 invalidate_ce_path(ce
, o
);
2430 static void show_stage_entry(FILE *o
,
2431 const char *label
, const struct cache_entry
*ce
)
2434 fprintf(o
, "%s (missing)\n", label
);
2436 fprintf(o
, "%s%06o %s %d\t%s\n",
2439 oid_to_hex(&ce
->oid
),
2445 int threeway_merge(const struct cache_entry
* const *stages
,
2446 struct unpack_trees_options
*o
)
2448 const struct cache_entry
*index
;
2449 const struct cache_entry
*head
;
2450 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
2453 int remote_match
= 0;
2455 int df_conflict_head
= 0;
2456 int df_conflict_remote
= 0;
2458 int any_anc_missing
= 0;
2459 int no_anc_exists
= 1;
2462 for (i
= 1; i
< o
->head_idx
; i
++) {
2463 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
2464 any_anc_missing
= 1;
2470 head
= stages
[o
->head_idx
];
2472 if (head
== o
->df_conflict_entry
) {
2473 df_conflict_head
= 1;
2477 if (remote
== o
->df_conflict_entry
) {
2478 df_conflict_remote
= 1;
2483 * First, if there's a #16 situation, note that to prevent #13
2486 if (!same(remote
, head
)) {
2487 for (i
= 1; i
< o
->head_idx
; i
++) {
2488 if (same(stages
[i
], head
)) {
2491 if (same(stages
[i
], remote
)) {
2498 * We start with cases where the index is allowed to match
2499 * something other than the head: #14(ALT) and #2ALT, where it
2500 * is permitted to match the result instead.
2502 /* #14, #14ALT, #2ALT */
2503 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
2504 if (index
&& !same(index
, remote
) && !same(index
, head
))
2505 return reject_merge(index
, o
);
2506 return merged_entry(remote
, index
, o
);
2509 * If we have an entry in the index cache, then we want to
2510 * make sure that it matches head.
2512 if (index
&& !same(index
, head
))
2513 return reject_merge(index
, o
);
2517 if (same(head
, remote
))
2518 return merged_entry(head
, index
, o
);
2520 if (!df_conflict_remote
&& remote_match
&& !head_match
)
2521 return merged_entry(head
, index
, o
);
2525 if (!head
&& !remote
&& any_anc_missing
)
2529 * Under the "aggressive" rule, we resolve mostly trivial
2530 * cases that we historically had git-merge-one-file resolve.
2532 if (o
->aggressive
) {
2533 int head_deleted
= !head
;
2534 int remote_deleted
= !remote
;
2535 const struct cache_entry
*ce
= NULL
;
2544 for (i
= 1; i
< o
->head_idx
; i
++) {
2545 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2554 * Deleted in one and unchanged in the other.
2556 if ((head_deleted
&& remote_deleted
) ||
2557 (head_deleted
&& remote
&& remote_match
) ||
2558 (remote_deleted
&& head
&& head_match
)) {
2560 return deleted_entry(index
, index
, o
);
2561 if (ce
&& !head_deleted
) {
2562 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2568 * Added in both, identically.
2570 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
2571 return merged_entry(head
, index
, o
);
2575 /* Below are "no merge" cases, which require that the index be
2576 * up-to-date to avoid the files getting overwritten with
2577 * conflict resolution files.
2580 if (verify_uptodate(index
, o
))
2584 o
->nontrivial_merge
= 1;
2586 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2588 if (!head_match
|| !remote_match
) {
2589 for (i
= 1; i
< o
->head_idx
; i
++) {
2590 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2591 keep_entry(stages
[i
], o
);
2599 fprintf(stderr
, "read-tree: warning #16 detected\n");
2600 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2601 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2604 if (head
) { count
+= keep_entry(head
, o
); }
2605 if (remote
) { count
+= keep_entry(remote
, o
); }
2612 * The rule is to "carry forward" what is in the index without losing
2613 * information across a "fast-forward", favoring a successful merge
2614 * over a merge failure when it makes sense. For details of the
2615 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2618 int twoway_merge(const struct cache_entry
* const *src
,
2619 struct unpack_trees_options
*o
)
2621 const struct cache_entry
*current
= src
[0];
2622 const struct cache_entry
*oldtree
= src
[1];
2623 const struct cache_entry
*newtree
= src
[2];
2625 if (o
->merge_size
!= 2)
2626 return error("Cannot do a twoway merge of %d trees",
2629 if (oldtree
== o
->df_conflict_entry
)
2631 if (newtree
== o
->df_conflict_entry
)
2635 if (current
->ce_flags
& CE_CONFLICTED
) {
2636 if (same(oldtree
, newtree
) || o
->reset
) {
2638 return deleted_entry(current
, current
, o
);
2640 return merged_entry(newtree
, current
, o
);
2642 return reject_merge(current
, o
);
2643 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2644 (!oldtree
&& newtree
&&
2645 same(current
, newtree
)) || /* 6 and 7 */
2646 (oldtree
&& newtree
&&
2647 same(oldtree
, newtree
)) || /* 14 and 15 */
2648 (oldtree
&& newtree
&&
2649 !same(oldtree
, newtree
) && /* 18 and 19 */
2650 same(current
, newtree
))) {
2651 return keep_entry(current
, o
);
2652 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2654 return deleted_entry(oldtree
, current
, o
);
2655 } else if (oldtree
&& newtree
&&
2656 same(current
, oldtree
) && !same(current
, newtree
)) {
2658 return merged_entry(newtree
, current
, o
);
2659 } else if (current
&& !oldtree
&& newtree
&&
2660 S_ISSPARSEDIR(current
->ce_mode
) != S_ISSPARSEDIR(newtree
->ce_mode
) &&
2661 ce_stage(current
) == 0) {
2663 * This case is a directory/file conflict across the sparse-index
2664 * boundary. When we are changing from one path to another via
2665 * 'git checkout', then we want to replace one entry with another
2666 * via merged_entry(). If there are staged changes, then we should
2667 * reject the merge instead.
2669 return merged_entry(newtree
, current
, o
);
2671 return reject_merge(current
, o
);
2674 if (oldtree
&& !o
->initial_checkout
) {
2676 * deletion of the path was staged;
2678 if (same(oldtree
, newtree
))
2680 return reject_merge(oldtree
, o
);
2682 return merged_entry(newtree
, current
, o
);
2684 return deleted_entry(oldtree
, current
, o
);
2690 * Keep the index entries at stage0, collapse stage1 but make sure
2691 * stage0 does not have anything there.
2693 int bind_merge(const struct cache_entry
* const *src
,
2694 struct unpack_trees_options
*o
)
2696 const struct cache_entry
*old
= src
[0];
2697 const struct cache_entry
*a
= src
[1];
2699 if (o
->merge_size
!= 1)
2700 return error("Cannot do a bind merge of %d trees",
2703 return o
->quiet
? -1 :
2704 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2705 super_prefixed(a
->name
),
2706 super_prefixed(old
->name
));
2708 return keep_entry(old
, o
);
2710 return merged_entry(a
, NULL
, o
);
2717 * - take the stat information from stage0, take the data from stage1
2719 int oneway_merge(const struct cache_entry
* const *src
,
2720 struct unpack_trees_options
*o
)
2722 const struct cache_entry
*old
= src
[0];
2723 const struct cache_entry
*a
= src
[1];
2725 if (o
->merge_size
!= 1)
2726 return error("Cannot do a oneway merge of %d trees",
2729 if (!a
|| a
== o
->df_conflict_entry
)
2730 return deleted_entry(old
, old
, o
);
2732 if (old
&& same(old
, a
)) {
2734 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
) &&
2735 !(old
->ce_flags
& CE_FSMONITOR_VALID
)) {
2737 if (lstat(old
->name
, &st
) ||
2738 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2739 update
|= CE_UPDATE
;
2741 if (o
->update
&& S_ISGITLINK(old
->ce_mode
) &&
2742 should_update_submodules() && !verify_uptodate(old
, o
))
2743 update
|= CE_UPDATE
;
2744 add_entry(o
, old
, update
, CE_STAGEMASK
);
2747 return merged_entry(a
, old
, o
);
2751 * Merge worktree and untracked entries in a stash entry.
2753 * Ignore all index entries. Collapse remaining trees but make sure that they
2754 * don't have any conflicting files.
2756 int stash_worktree_untracked_merge(const struct cache_entry
* const *src
,
2757 struct unpack_trees_options
*o
)
2759 const struct cache_entry
*worktree
= src
[1];
2760 const struct cache_entry
*untracked
= src
[2];
2762 if (o
->merge_size
!= 2)
2763 BUG("invalid merge_size: %d", o
->merge_size
);
2765 if (worktree
&& untracked
)
2766 return error(_("worktree and untracked commit have duplicate entries: %s"),
2767 super_prefixed(worktree
->name
));
2769 return merged_entry(worktree
? worktree
: untracked
, NULL
, o
);