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_nondirectories() 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
,
988 * If we have not precomputed the traverse path, it is quicker
989 * to avoid doing so. But if we have precomputed it,
990 * it is quicker to use the precomputed version.
992 if (!info
->traverse_path
)
993 return do_compare_entry_piecewise(ce
, info
, name
, namelen
, mode
);
995 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
999 pathlen
= info
->pathlen
;
1000 ce_len
= ce_namelen(ce
);
1002 if (ce_len
< pathlen
)
1006 ce_name
= ce
->name
+ pathlen
;
1008 return df_name_compare(ce_name
, ce_len
, S_IFREG
, name
, namelen
, mode
);
1011 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
1013 int cmp
= do_compare_entry(ce
, info
, n
->path
, n
->pathlen
, n
->mode
);
1018 * Even if the beginning compared identically, the ce should
1019 * compare as bigger than a directory leading up to it!
1021 return ce_namelen(ce
) > traverse_path_len(info
, tree_entry_len(n
));
1024 static int ce_in_traverse_path(const struct cache_entry
*ce
,
1025 const struct traverse_info
*info
)
1029 if (do_compare_entry(ce
, info
->prev
,
1030 info
->name
, info
->namelen
, info
->mode
))
1033 * If ce (blob) is the same name as the path (which is a tree
1034 * we will be descending into), it won't be inside it.
1036 return (info
->pathlen
< ce_namelen(ce
));
1039 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
,
1040 const struct name_entry
*n
,
1042 struct index_state
*istate
,
1045 size_t len
= traverse_path_len(info
, tree_entry_len(n
));
1046 struct cache_entry
*ce
=
1048 make_empty_transient_cache_entry(len
, NULL
) :
1049 make_empty_cache_entry(istate
, len
);
1051 ce
->ce_mode
= create_ce_mode(n
->mode
);
1052 ce
->ce_flags
= create_ce_flags(stage
);
1053 ce
->ce_namelen
= len
;
1054 oidcpy(&ce
->oid
, &n
->oid
);
1055 /* len+1 because the cache_entry allocates space for NUL */
1056 make_traverse_path(ce
->name
, len
+ 1, info
, n
->path
, n
->pathlen
);
1062 * Note that traverse_by_cache_tree() duplicates some logic in this function
1063 * without actually calling it. If you change the logic here you may need to
1064 * check and change there as well.
1066 static int unpack_nondirectories(int n
, unsigned long mask
,
1067 unsigned long dirmask
,
1068 struct cache_entry
**src
,
1069 const struct name_entry
*names
,
1070 const struct traverse_info
*info
)
1073 struct unpack_trees_options
*o
= info
->data
;
1074 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
1076 /* Do we have *only* directories? Nothing to do */
1077 if (mask
== dirmask
&& !src
[0])
1081 * Ok, we've filled in up to any potential index entry in src[0],
1084 for (i
= 0; i
< n
; i
++) {
1086 unsigned int bit
= 1ul << i
;
1087 if (conflicts
& bit
) {
1088 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
1095 else if (i
+ 1 < o
->head_idx
)
1097 else if (i
+ 1 > o
->head_idx
)
1103 * If the merge bit is set, then the cache entries are
1104 * discarded in the following block. In this case,
1105 * construct "transient" cache_entries, as they are
1106 * not stored in the index. otherwise construct the
1107 * cache entry from the index aware logic.
1109 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
, &o
->result
, o
->merge
);
1113 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
1115 for (i
= 0; i
< n
; i
++) {
1116 struct cache_entry
*ce
= src
[i
+ o
->merge
];
1117 if (ce
!= o
->df_conflict_entry
)
1118 discard_cache_entry(ce
);
1123 for (i
= 0; i
< n
; i
++)
1124 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
1125 if (do_add_entry(o
, src
[i
], 0, 0))
1131 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
1133 discard_index(&o
->result
);
1134 if (!o
->quiet
&& !o
->exiting_early
) {
1136 return error("%s", message
);
1143 * The tree traversal is looking at name p. If we have a matching entry,
1144 * return it. If name p is a directory in the index, do not return
1145 * anything, as we will want to match it when the traversal descends into
1148 static int find_cache_pos(struct traverse_info
*info
,
1149 const char *p
, size_t p_len
)
1152 struct unpack_trees_options
*o
= info
->data
;
1153 struct index_state
*index
= o
->src_index
;
1154 int pfxlen
= info
->pathlen
;
1156 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
1157 const struct cache_entry
*ce
= index
->cache
[pos
];
1158 const char *ce_name
, *ce_slash
;
1161 if (ce
->ce_flags
& CE_UNPACKED
) {
1163 * cache_bottom entry is already unpacked, so
1164 * we can never match it; don't check it
1167 if (pos
== o
->cache_bottom
)
1171 if (!ce_in_traverse_path(ce
, info
)) {
1173 * Check if we can skip future cache checks
1174 * (because we're already past all possible
1175 * entries in the traverse path).
1177 if (info
->traverse_path
) {
1178 if (strncmp(ce
->name
, info
->traverse_path
,
1184 ce_name
= ce
->name
+ pfxlen
;
1185 ce_slash
= strchr(ce_name
, '/');
1187 ce_len
= ce_slash
- ce_name
;
1189 ce_len
= ce_namelen(ce
) - pfxlen
;
1190 cmp
= name_compare(p
, p_len
, ce_name
, ce_len
);
1192 * Exact match; if we have a directory we need to
1193 * delay returning it.
1196 return ce_slash
? -2 - pos
: pos
;
1198 continue; /* keep looking */
1200 * ce_name sorts after p->path; could it be that we
1201 * have files under p->path directory in the index?
1202 * E.g. ce_name == "t-i", and p->path == "t"; we may
1203 * have "t/a" in the index.
1205 if (p_len
< ce_len
&& !memcmp(ce_name
, p
, p_len
) &&
1206 ce_name
[p_len
] < '/')
1207 continue; /* keep looking */
1213 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
1214 const struct name_entry
*p
)
1216 int pos
= find_cache_pos(info
, p
->path
, p
->pathlen
);
1217 struct unpack_trees_options
*o
= info
->data
;
1220 return o
->src_index
->cache
[pos
];
1225 static void debug_path(struct traverse_info
*info
)
1228 debug_path(info
->prev
);
1229 if (*info
->prev
->name
)
1232 printf("%s", info
->name
);
1235 static void debug_name_entry(int i
, struct name_entry
*n
)
1237 printf("ent#%d %06o %s\n", i
,
1238 n
->path
? n
->mode
: 0,
1239 n
->path
? n
->path
: "(missing)");
1242 static void debug_unpack_callback(int n
,
1244 unsigned long dirmask
,
1245 struct name_entry
*names
,
1246 struct traverse_info
*info
)
1249 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
1253 for (i
= 0; i
< n
; i
++)
1254 debug_name_entry(i
, names
+ i
);
1258 * Note that traverse_by_cache_tree() duplicates some logic in this function
1259 * without actually calling it. If you change the logic here you may need to
1260 * check and change there as well.
1262 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
1264 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
1265 struct unpack_trees_options
*o
= info
->data
;
1266 const struct name_entry
*p
= names
;
1268 /* Find first entry with a real name (we could use "mask" too) */
1272 if (o
->debug_unpack
)
1273 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
1275 /* Are we supposed to look at the index too? */
1279 struct cache_entry
*ce
;
1281 if (o
->diff_index_cached
)
1282 ce
= next_cache_entry(o
);
1284 ce
= find_cache_entry(info
, p
);
1288 cmp
= compare_entry(ce
, info
, p
);
1290 if (unpack_index_entry(ce
, o
) < 0)
1291 return unpack_failed(o
, NULL
);
1297 * If we skip unmerged index
1298 * entries, we'll skip this
1299 * entry *and* the tree
1300 * entries associated with it!
1302 if (o
->skip_unmerged
) {
1303 add_same_unmerged(ce
, o
);
1313 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
1316 if (o
->merge
&& src
[0]) {
1317 if (ce_stage(src
[0]))
1318 mark_ce_used_same_name(src
[0], o
);
1320 mark_ce_used(src
[0], o
);
1323 /* Now handle any directories.. */
1325 /* special case: "diff-index --cached" looking at a tree */
1326 if (o
->diff_index_cached
&&
1327 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1329 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1332 * Everything under the name matches; skip the
1333 * entire hierarchy. diff_index_cached codepath
1334 * special cases D/F conflicts in such a way that
1335 * it does not do any look-ahead, so this is safe.
1338 o
->cache_bottom
+= matches
;
1343 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1352 static int clear_ce_flags_1(struct index_state
*istate
,
1353 struct cache_entry
**cache
, int nr
,
1354 struct strbuf
*prefix
,
1355 int select_mask
, int clear_mask
,
1356 struct pattern_list
*pl
,
1357 enum pattern_match_result default_match
,
1360 /* Whole directory matching */
1361 static int clear_ce_flags_dir(struct index_state
*istate
,
1362 struct cache_entry
**cache
, int nr
,
1363 struct strbuf
*prefix
,
1365 int select_mask
, int clear_mask
,
1366 struct pattern_list
*pl
,
1367 enum pattern_match_result default_match
,
1370 struct cache_entry
**cache_end
;
1373 enum pattern_match_result ret
, orig_ret
;
1374 orig_ret
= path_matches_pattern_list(prefix
->buf
, prefix
->len
,
1375 basename
, &dtype
, pl
, istate
);
1377 strbuf_addch(prefix
, '/');
1379 /* If undecided, use matching result of parent dir in defval */
1380 if (orig_ret
== UNDECIDED
)
1381 ret
= default_match
;
1385 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1386 struct cache_entry
*ce
= *cache_end
;
1387 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1391 if (pl
->use_cone_patterns
&& orig_ret
== MATCHED_RECURSIVE
) {
1392 struct cache_entry
**ce
= cache
;
1393 rc
= cache_end
- cache
;
1395 while (ce
< cache_end
) {
1396 (*ce
)->ce_flags
&= ~clear_mask
;
1399 } else if (pl
->use_cone_patterns
&& orig_ret
== NOT_MATCHED
) {
1400 rc
= cache_end
- cache
;
1402 rc
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1404 select_mask
, clear_mask
,
1409 strbuf_setlen(prefix
, prefix
->len
- 1);
1414 * Traverse the index, find every entry that matches according to
1415 * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the
1416 * number of traversed entries.
1418 * If select_mask is non-zero, only entries whose ce_flags has on of
1419 * those bits enabled are traversed.
1421 * cache : pointer to an index entry
1422 * prefix_len : an offset to its path
1424 * The current path ("prefix") including the trailing '/' is
1425 * cache[0]->name[0..(prefix_len-1)]
1426 * Top level path has prefix_len zero.
1428 static int clear_ce_flags_1(struct index_state
*istate
,
1429 struct cache_entry
**cache
, int nr
,
1430 struct strbuf
*prefix
,
1431 int select_mask
, int clear_mask
,
1432 struct pattern_list
*pl
,
1433 enum pattern_match_result default_match
,
1436 struct cache_entry
**cache_end
= nr
? cache
+ nr
: cache
;
1439 * Process all entries that have the given prefix and meet
1440 * select_mask condition
1442 while(cache
!= cache_end
) {
1443 struct cache_entry
*ce
= *cache
;
1444 const char *name
, *slash
;
1446 enum pattern_match_result ret
;
1448 display_progress(istate
->progress
, progress_nr
);
1450 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1456 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1459 name
= ce
->name
+ prefix
->len
;
1460 slash
= strchr(name
, '/');
1462 /* If it's a directory, try whole directory match first */
1467 strbuf_add(prefix
, name
, len
);
1469 processed
= clear_ce_flags_dir(istate
, cache
, cache_end
- cache
,
1471 prefix
->buf
+ prefix
->len
- len
,
1472 select_mask
, clear_mask
,
1476 /* clear_c_f_dir eats a whole dir already? */
1479 progress_nr
+= processed
;
1480 strbuf_setlen(prefix
, prefix
->len
- len
);
1484 strbuf_addch(prefix
, '/');
1485 processed
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1487 select_mask
, clear_mask
, pl
,
1488 default_match
, progress_nr
);
1491 progress_nr
+= processed
;
1493 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1498 dtype
= ce_to_dtype(ce
);
1499 ret
= path_matches_pattern_list(ce
->name
,
1501 name
, &dtype
, pl
, istate
);
1502 if (ret
== UNDECIDED
)
1503 ret
= default_match
;
1504 if (ret
== MATCHED
|| ret
== MATCHED_RECURSIVE
)
1505 ce
->ce_flags
&= ~clear_mask
;
1510 display_progress(istate
->progress
, progress_nr
);
1511 return nr
- (cache_end
- cache
);
1514 static int clear_ce_flags(struct index_state
*istate
,
1515 int select_mask
, int clear_mask
,
1516 struct pattern_list
*pl
,
1519 static struct strbuf prefix
= STRBUF_INIT
;
1523 strbuf_reset(&prefix
);
1525 istate
->progress
= start_delayed_progress(
1526 _("Updating index flags"),
1529 xsnprintf(label
, sizeof(label
), "clear_ce_flags(0x%08lx,0x%08lx)",
1530 (unsigned long)select_mask
, (unsigned long)clear_mask
);
1531 trace2_region_enter("unpack_trees", label
, the_repository
);
1532 rval
= clear_ce_flags_1(istate
,
1536 select_mask
, clear_mask
,
1538 trace2_region_leave("unpack_trees", label
, the_repository
);
1540 stop_progress(&istate
->progress
);
1545 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1547 static void mark_new_skip_worktree(struct pattern_list
*pl
,
1548 struct index_state
*istate
,
1549 int select_flag
, int skip_wt_flag
,
1555 * 1. Pretend the narrowest worktree: only unmerged entries
1558 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1559 struct cache_entry
*ce
= istate
->cache
[i
];
1561 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1564 if (!ce_stage(ce
) && !(ce
->ce_flags
& CE_CONFLICTED
))
1565 ce
->ce_flags
|= skip_wt_flag
;
1567 ce
->ce_flags
&= ~skip_wt_flag
;
1571 * 2. Widen worktree according to sparse-checkout file.
1572 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1574 clear_ce_flags(istate
, select_flag
, skip_wt_flag
, pl
, show_progress
);
1577 static void populate_from_existing_patterns(struct unpack_trees_options
*o
,
1578 struct pattern_list
*pl
)
1580 if (get_sparse_checkout_patterns(pl
) < 0)
1581 o
->skip_sparse_checkout
= 1;
1587 static int verify_absent(const struct cache_entry
*,
1588 enum unpack_trees_error_types
,
1589 struct unpack_trees_options
*);
1591 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1592 * resulting index, -2 on failure to reflect the changes to the work tree.
1594 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1596 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1598 struct repository
*repo
= the_repository
;
1600 static struct cache_entry
*dfc
;
1601 struct pattern_list pl
;
1602 int free_pattern_list
= 0;
1604 if (len
> MAX_UNPACK_TREES
)
1605 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1607 trace_performance_enter();
1608 trace2_region_enter("unpack_trees", "unpack_trees", the_repository
);
1610 prepare_repo_settings(repo
);
1611 if (repo
->settings
.command_requires_full_index
) {
1612 ensure_full_index(o
->src_index
);
1613 ensure_full_index(o
->dst_index
);
1616 if (!core_apply_sparse_checkout
|| !o
->update
)
1617 o
->skip_sparse_checkout
= 1;
1618 if (!o
->skip_sparse_checkout
&& !o
->pl
) {
1619 memset(&pl
, 0, sizeof(pl
));
1620 free_pattern_list
= 1;
1621 populate_from_existing_patterns(o
, &pl
);
1624 memset(&o
->result
, 0, sizeof(o
->result
));
1625 o
->result
.initialized
= 1;
1626 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1627 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1628 o
->result
.version
= o
->src_index
->version
;
1629 if (!o
->src_index
->split_index
) {
1630 o
->result
.split_index
= NULL
;
1631 } else if (o
->src_index
== o
->dst_index
) {
1633 * o->dst_index (and thus o->src_index) will be discarded
1634 * and overwritten with o->result at the end of this function,
1635 * so just use src_index's split_index to avoid having to
1638 o
->result
.split_index
= o
->src_index
->split_index
;
1639 o
->result
.split_index
->refcount
++;
1641 o
->result
.split_index
= init_split_index(&o
->result
);
1643 oidcpy(&o
->result
.oid
, &o
->src_index
->oid
);
1644 o
->merge_size
= len
;
1645 mark_all_ce_unused(o
->src_index
);
1647 o
->result
.fsmonitor_last_update
=
1648 xstrdup_or_null(o
->src_index
->fsmonitor_last_update
);
1651 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1653 if (!o
->skip_sparse_checkout
)
1654 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1655 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1658 dfc
= xcalloc(1, cache_entry_size(0));
1659 o
->df_conflict_entry
= dfc
;
1662 const char *prefix
= o
->prefix
? o
->prefix
: "";
1663 struct traverse_info info
;
1665 setup_traverse_info(&info
, prefix
);
1666 info
.fn
= unpack_callback
;
1668 info
.show_all_errors
= o
->show_all_errors
;
1669 info
.pathspec
= o
->pathspec
;
1673 * Unpack existing index entries that sort before the
1674 * prefix the tree is spliced into. Note that o->merge
1675 * is always true in this case.
1678 struct cache_entry
*ce
= next_cache_entry(o
);
1681 if (ce_in_traverse_path(ce
, &info
))
1683 if (unpack_index_entry(ce
, o
) < 0)
1688 trace_performance_enter();
1689 trace2_region_enter("unpack_trees", "traverse_trees", the_repository
);
1690 ret
= traverse_trees(o
->src_index
, len
, t
, &info
);
1691 trace2_region_leave("unpack_trees", "traverse_trees", the_repository
);
1692 trace_performance_leave("traverse_trees");
1697 /* Any left-over entries in the index? */
1700 struct cache_entry
*ce
= next_cache_entry(o
);
1703 if (unpack_index_entry(ce
, o
) < 0)
1707 mark_all_ce_unused(o
->src_index
);
1709 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1710 ret
= unpack_failed(o
, "Merge requires file-level merging");
1714 if (!o
->skip_sparse_checkout
) {
1716 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1717 * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1718 * so apply_sparse_checkout() won't attempt to remove it from worktree
1720 mark_new_skip_worktree(o
->pl
, &o
->result
,
1721 CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
,
1725 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1726 struct cache_entry
*ce
= o
->result
.cache
[i
];
1729 * Entries marked with CE_ADDED in merged_entry() do not have
1730 * verify_absent() check (the check is effectively disabled
1731 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1733 * Do the real check now because we have had
1734 * correct CE_NEW_SKIP_WORKTREE
1736 if (ce
->ce_flags
& CE_ADDED
&&
1737 verify_absent(ce
, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
, o
))
1740 if (apply_sparse_checkout(&o
->result
, ce
, o
))
1745 * Inability to sparsify or de-sparsify individual
1746 * paths is not an error, but just a warning.
1748 if (o
->show_all_errors
)
1749 display_warning_msgs(o
);
1754 ret
= check_updates(o
, &o
->result
) ? (-2) : 0;
1756 move_index_extensions(&o
->result
, o
->src_index
);
1758 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
1759 cache_tree_verify(the_repository
, &o
->result
);
1760 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1761 cache_tree_update(&o
->result
,
1766 o
->result
.updated_workdir
= 1;
1767 discard_index(o
->dst_index
);
1768 *o
->dst_index
= o
->result
;
1770 discard_index(&o
->result
);
1772 o
->src_index
= NULL
;
1775 if (free_pattern_list
)
1776 clear_pattern_list(&pl
);
1777 trace2_region_leave("unpack_trees", "unpack_trees", the_repository
);
1778 trace_performance_leave("unpack_trees");
1782 if (o
->show_all_errors
)
1783 display_error_msgs(o
);
1784 mark_all_ce_unused(o
->src_index
);
1785 ret
= unpack_failed(o
, NULL
);
1786 if (o
->exiting_early
)
1792 * Update SKIP_WORKTREE bits according to sparsity patterns, and update
1793 * working directory to match.
1795 * CE_NEW_SKIP_WORKTREE is used internally.
1797 enum update_sparsity_result
update_sparsity(struct unpack_trees_options
*o
)
1799 enum update_sparsity_result ret
= UPDATE_SPARSITY_SUCCESS
;
1800 struct pattern_list pl
;
1802 unsigned old_show_all_errors
;
1803 int free_pattern_list
= 0;
1805 old_show_all_errors
= o
->show_all_errors
;
1806 o
->show_all_errors
= 1;
1809 if (!o
->update
|| o
->index_only
|| o
->skip_sparse_checkout
)
1810 BUG("update_sparsity() is for reflecting sparsity patterns in working directory");
1811 if (o
->src_index
!= o
->dst_index
|| o
->fn
)
1812 BUG("update_sparsity() called wrong");
1814 trace_performance_enter();
1816 /* If we weren't given patterns, use the recorded ones */
1818 memset(&pl
, 0, sizeof(pl
));
1819 free_pattern_list
= 1;
1820 populate_from_existing_patterns(o
, &pl
);
1821 if (o
->skip_sparse_checkout
)
1822 goto skip_sparse_checkout
;
1825 /* Set NEW_SKIP_WORKTREE on existing entries. */
1826 mark_all_ce_unused(o
->src_index
);
1827 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1828 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1830 /* Then loop over entries and update/remove as needed */
1831 ret
= UPDATE_SPARSITY_SUCCESS
;
1832 for (i
= 0; i
< o
->src_index
->cache_nr
; i
++) {
1833 struct cache_entry
*ce
= o
->src_index
->cache
[i
];
1837 /* -1 because for loop will increment by 1 */
1838 i
+= warn_conflicted_path(o
->src_index
, i
, o
) - 1;
1839 ret
= UPDATE_SPARSITY_WARNINGS
;
1843 if (apply_sparse_checkout(o
->src_index
, ce
, o
))
1844 ret
= UPDATE_SPARSITY_WARNINGS
;
1847 skip_sparse_checkout
:
1848 if (check_updates(o
, o
->src_index
))
1849 ret
= UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES
;
1851 display_warning_msgs(o
);
1852 o
->show_all_errors
= old_show_all_errors
;
1853 if (free_pattern_list
)
1854 clear_pattern_list(&pl
);
1855 trace_performance_leave("update_sparsity");
1859 /* Here come the merge functions */
1861 static int reject_merge(const struct cache_entry
*ce
,
1862 struct unpack_trees_options
*o
)
1864 return add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1867 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1873 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1875 return a
->ce_mode
== b
->ce_mode
&&
1876 oideq(&a
->oid
, &b
->oid
);
1881 * When a CE gets turned into an unmerged entry, we
1882 * want it to be up-to-date
1884 static int verify_uptodate_1(const struct cache_entry
*ce
,
1885 struct unpack_trees_options
*o
,
1886 enum unpack_trees_error_types error_type
)
1894 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1895 * if this entry is truly up-to-date because this file may be
1898 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1899 ; /* keep checking */
1900 else if (o
->reset
|| ce_uptodate(ce
))
1903 if (!lstat(ce
->name
, &st
)) {
1904 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1905 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1907 if (submodule_from_ce(ce
)) {
1908 int r
= check_submodule_move_head(ce
,
1909 "HEAD", oid_to_hex(&ce
->oid
), o
);
1911 return add_rejected_path(o
, error_type
, ce
->name
);
1918 * Historic default policy was to allow submodule to be out
1919 * of sync wrt the superproject index. If the submodule was
1920 * not considered interesting above, we don't care here.
1922 if (S_ISGITLINK(ce
->ce_mode
))
1927 if (errno
== ENOENT
)
1929 return add_rejected_path(o
, error_type
, ce
->name
);
1932 int verify_uptodate(const struct cache_entry
*ce
,
1933 struct unpack_trees_options
*o
)
1935 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1937 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1940 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1941 struct unpack_trees_options
*o
)
1943 return verify_uptodate_1(ce
, o
, WARNING_SPARSE_NOT_UPTODATE_FILE
);
1947 * TODO: We should actually invalidate o->result, not src_index [1].
1948 * But since cache tree and untracked cache both are not copied to
1949 * o->result until unpacking is complete, we invalidate them on
1950 * src_index instead with the assumption that they will be copied to
1951 * dst_index at the end.
1953 * [1] src_index->cache_tree is also used in unpack_callback() so if
1954 * we invalidate o->result, we need to update it to use
1955 * o->result.cache_tree as well.
1957 static void invalidate_ce_path(const struct cache_entry
*ce
,
1958 struct unpack_trees_options
*o
)
1962 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1963 untracked_cache_invalidate_path(o
->src_index
, ce
->name
, 1);
1967 * Check that checking out ce->sha1 in subdir ce->name is not
1968 * going to overwrite any working files.
1970 static int verify_clean_submodule(const char *old_sha1
,
1971 const struct cache_entry
*ce
,
1972 struct unpack_trees_options
*o
)
1974 if (!submodule_from_ce(ce
))
1977 return check_submodule_move_head(ce
, old_sha1
,
1978 oid_to_hex(&ce
->oid
), o
);
1981 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1982 struct unpack_trees_options
*o
)
1985 * we are about to extract "ce->name"; we would not want to lose
1986 * anything in the existing directory there.
1990 struct dir_struct d
;
1994 if (S_ISGITLINK(ce
->ce_mode
)) {
1995 struct object_id oid
;
1996 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", &oid
);
1998 * If we are not going to update the submodule, then
2001 if (!sub_head
&& oideq(&oid
, &ce
->oid
))
2003 return verify_clean_submodule(sub_head
? NULL
: oid_to_hex(&oid
),
2008 * First let's make sure we do not have a local modification
2009 * in that directory.
2011 namelen
= ce_namelen(ce
);
2012 for (i
= locate_in_src_index(ce
, o
);
2013 i
< o
->src_index
->cache_nr
;
2015 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
2016 int len
= ce_namelen(ce2
);
2017 if (len
< namelen
||
2018 strncmp(ce
->name
, ce2
->name
, namelen
) ||
2019 ce2
->name
[namelen
] != '/')
2022 * ce2->name is an entry in the subdirectory to be
2025 if (!ce_stage(ce2
)) {
2026 if (verify_uptodate(ce2
, o
))
2028 add_entry(o
, ce2
, CE_REMOVE
, 0);
2029 invalidate_ce_path(ce
, o
);
2030 mark_ce_used(ce2
, o
);
2036 * Then we need to make sure that we do not lose a locally
2037 * present file that is not ignored.
2039 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
2041 memset(&d
, 0, sizeof(d
));
2043 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
2044 i
= read_directory(&d
, o
->src_index
, pathbuf
, namelen
+1, NULL
);
2046 return add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
2052 * This gets called when there was no index entry for the tree entry 'dst',
2053 * but we found a file in the working tree that 'lstat()' said was fine,
2054 * and we're on a case-insensitive filesystem.
2056 * See if we can find a case-insensitive match in the index that also
2057 * matches the stat information, and assume it's that other file!
2059 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
2061 const struct cache_entry
*src
;
2063 src
= index_file_exists(o
->src_index
, name
, len
, 1);
2064 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
2067 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
2068 const struct cache_entry
*ce
, struct stat
*st
,
2069 enum unpack_trees_error_types error_type
,
2070 struct unpack_trees_options
*o
)
2072 const struct cache_entry
*result
;
2075 * It may be that the 'lstat()' succeeded even though
2076 * target 'ce' was absent, because there is an old
2077 * entry that is different only in case..
2079 * Ignore that lstat() if it matches.
2081 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
2085 is_excluded(o
->dir
, o
->src_index
, name
, &dtype
))
2087 * ce->name is explicitly excluded, so it is Ok to
2091 if (S_ISDIR(st
->st_mode
)) {
2093 * We are checking out path "foo" and
2094 * found "foo/." in the working tree.
2095 * This is tricky -- if we have modified
2096 * files that are in "foo/" we would lose
2099 if (verify_clean_subdirectory(ce
, o
) < 0)
2105 * The previous round may already have decided to
2106 * delete this path, which is in a subdirectory that
2107 * is being replaced with a blob.
2109 result
= index_file_exists(&o
->result
, name
, len
, 0);
2111 if (result
->ce_flags
& CE_REMOVE
)
2115 return add_rejected_path(o
, error_type
, name
);
2119 * We do not want to remove or overwrite a working tree file that
2120 * is not tracked, unless it is ignored.
2122 static int verify_absent_1(const struct cache_entry
*ce
,
2123 enum unpack_trees_error_types error_type
,
2124 struct unpack_trees_options
*o
)
2129 if (o
->index_only
|| o
->reset
|| !o
->update
)
2132 len
= check_leading_path(ce
->name
, ce_namelen(ce
), 0);
2139 path
= xmemdupz(ce
->name
, len
);
2140 if (lstat(path
, &st
))
2141 ret
= error_errno("cannot stat '%s'", path
);
2143 if (submodule_from_ce(ce
))
2144 ret
= check_submodule_move_head(ce
,
2145 oid_to_hex(&ce
->oid
),
2148 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
2149 &st
, error_type
, o
);
2153 } else if (lstat(ce
->name
, &st
)) {
2154 if (errno
!= ENOENT
)
2155 return error_errno("cannot stat '%s'", ce
->name
);
2158 if (submodule_from_ce(ce
))
2159 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
2162 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
2163 ce_to_dtype(ce
), ce
, &st
,
2168 static int verify_absent(const struct cache_entry
*ce
,
2169 enum unpack_trees_error_types error_type
,
2170 struct unpack_trees_options
*o
)
2172 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
2174 return verify_absent_1(ce
, error_type
, o
);
2177 static int verify_absent_sparse(const struct cache_entry
*ce
,
2178 enum unpack_trees_error_types error_type
,
2179 struct unpack_trees_options
*o
)
2181 return verify_absent_1(ce
, error_type
, o
);
2184 static int merged_entry(const struct cache_entry
*ce
,
2185 const struct cache_entry
*old
,
2186 struct unpack_trees_options
*o
)
2188 int update
= CE_UPDATE
;
2189 struct cache_entry
*merge
= dup_cache_entry(ce
, &o
->result
);
2193 * New index entries. In sparse checkout, the following
2194 * verify_absent() will be delayed until after
2195 * traverse_trees() finishes in unpack_trees(), then:
2197 * - CE_NEW_SKIP_WORKTREE will be computed correctly
2198 * - verify_absent() be called again, this time with
2199 * correct CE_NEW_SKIP_WORKTREE
2201 * verify_absent() call here does nothing in sparse
2202 * checkout (i.e. o->skip_sparse_checkout == 0)
2205 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
2207 if (verify_absent(merge
,
2208 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
2209 discard_cache_entry(merge
);
2212 invalidate_ce_path(merge
, o
);
2214 if (submodule_from_ce(ce
) && file_exists(ce
->name
)) {
2215 int ret
= check_submodule_move_head(ce
, NULL
,
2216 oid_to_hex(&ce
->oid
),
2222 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
2224 * See if we can re-use the old CE directly?
2225 * That way we get the uptodate stat info.
2227 * This also removes the UPDATE flag on a match; otherwise
2228 * we will end up overwriting local changes in the work tree.
2230 if (same(old
, merge
)) {
2231 copy_cache_entry(merge
, old
);
2234 if (verify_uptodate(old
, o
)) {
2235 discard_cache_entry(merge
);
2238 /* Migrate old flags over */
2239 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
2240 invalidate_ce_path(old
, o
);
2243 if (submodule_from_ce(ce
) && file_exists(ce
->name
)) {
2244 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
2245 oid_to_hex(&ce
->oid
),
2252 * Previously unmerged entry left as an existence
2253 * marker by read_index_unmerged();
2255 invalidate_ce_path(old
, o
);
2258 if (do_add_entry(o
, merge
, update
, CE_STAGEMASK
) < 0)
2263 static int deleted_entry(const struct cache_entry
*ce
,
2264 const struct cache_entry
*old
,
2265 struct unpack_trees_options
*o
)
2267 /* Did it exist in the index? */
2269 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2273 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
2275 add_entry(o
, ce
, CE_REMOVE
, 0);
2276 invalidate_ce_path(ce
, o
);
2280 static int keep_entry(const struct cache_entry
*ce
,
2281 struct unpack_trees_options
*o
)
2283 add_entry(o
, ce
, 0, 0);
2285 invalidate_ce_path(ce
, o
);
2290 static void show_stage_entry(FILE *o
,
2291 const char *label
, const struct cache_entry
*ce
)
2294 fprintf(o
, "%s (missing)\n", label
);
2296 fprintf(o
, "%s%06o %s %d\t%s\n",
2299 oid_to_hex(&ce
->oid
),
2305 int threeway_merge(const struct cache_entry
* const *stages
,
2306 struct unpack_trees_options
*o
)
2308 const struct cache_entry
*index
;
2309 const struct cache_entry
*head
;
2310 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
2313 int remote_match
= 0;
2315 int df_conflict_head
= 0;
2316 int df_conflict_remote
= 0;
2318 int any_anc_missing
= 0;
2319 int no_anc_exists
= 1;
2322 for (i
= 1; i
< o
->head_idx
; i
++) {
2323 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
2324 any_anc_missing
= 1;
2330 head
= stages
[o
->head_idx
];
2332 if (head
== o
->df_conflict_entry
) {
2333 df_conflict_head
= 1;
2337 if (remote
== o
->df_conflict_entry
) {
2338 df_conflict_remote
= 1;
2343 * First, if there's a #16 situation, note that to prevent #13
2346 if (!same(remote
, head
)) {
2347 for (i
= 1; i
< o
->head_idx
; i
++) {
2348 if (same(stages
[i
], head
)) {
2351 if (same(stages
[i
], remote
)) {
2358 * We start with cases where the index is allowed to match
2359 * something other than the head: #14(ALT) and #2ALT, where it
2360 * is permitted to match the result instead.
2362 /* #14, #14ALT, #2ALT */
2363 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
2364 if (index
&& !same(index
, remote
) && !same(index
, head
))
2365 return reject_merge(index
, o
);
2366 return merged_entry(remote
, index
, o
);
2369 * If we have an entry in the index cache, then we want to
2370 * make sure that it matches head.
2372 if (index
&& !same(index
, head
))
2373 return reject_merge(index
, o
);
2377 if (same(head
, remote
))
2378 return merged_entry(head
, index
, o
);
2380 if (!df_conflict_remote
&& remote_match
&& !head_match
)
2381 return merged_entry(head
, index
, o
);
2385 if (!head
&& !remote
&& any_anc_missing
)
2389 * Under the "aggressive" rule, we resolve mostly trivial
2390 * cases that we historically had git-merge-one-file resolve.
2392 if (o
->aggressive
) {
2393 int head_deleted
= !head
;
2394 int remote_deleted
= !remote
;
2395 const struct cache_entry
*ce
= NULL
;
2404 for (i
= 1; i
< o
->head_idx
; i
++) {
2405 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2414 * Deleted in one and unchanged in the other.
2416 if ((head_deleted
&& remote_deleted
) ||
2417 (head_deleted
&& remote
&& remote_match
) ||
2418 (remote_deleted
&& head
&& head_match
)) {
2420 return deleted_entry(index
, index
, o
);
2421 if (ce
&& !head_deleted
) {
2422 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2428 * Added in both, identically.
2430 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
2431 return merged_entry(head
, index
, o
);
2435 /* Below are "no merge" cases, which require that the index be
2436 * up-to-date to avoid the files getting overwritten with
2437 * conflict resolution files.
2440 if (verify_uptodate(index
, o
))
2444 o
->nontrivial_merge
= 1;
2446 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2448 if (!head_match
|| !remote_match
) {
2449 for (i
= 1; i
< o
->head_idx
; i
++) {
2450 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2451 keep_entry(stages
[i
], o
);
2459 fprintf(stderr
, "read-tree: warning #16 detected\n");
2460 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2461 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2464 if (head
) { count
+= keep_entry(head
, o
); }
2465 if (remote
) { count
+= keep_entry(remote
, o
); }
2472 * The rule is to "carry forward" what is in the index without losing
2473 * information across a "fast-forward", favoring a successful merge
2474 * over a merge failure when it makes sense. For details of the
2475 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2478 int twoway_merge(const struct cache_entry
* const *src
,
2479 struct unpack_trees_options
*o
)
2481 const struct cache_entry
*current
= src
[0];
2482 const struct cache_entry
*oldtree
= src
[1];
2483 const struct cache_entry
*newtree
= src
[2];
2485 if (o
->merge_size
!= 2)
2486 return error("Cannot do a twoway merge of %d trees",
2489 if (oldtree
== o
->df_conflict_entry
)
2491 if (newtree
== o
->df_conflict_entry
)
2495 if (current
->ce_flags
& CE_CONFLICTED
) {
2496 if (same(oldtree
, newtree
) || o
->reset
) {
2498 return deleted_entry(current
, current
, o
);
2500 return merged_entry(newtree
, current
, o
);
2502 return reject_merge(current
, o
);
2503 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2504 (!oldtree
&& newtree
&&
2505 same(current
, newtree
)) || /* 6 and 7 */
2506 (oldtree
&& newtree
&&
2507 same(oldtree
, newtree
)) || /* 14 and 15 */
2508 (oldtree
&& newtree
&&
2509 !same(oldtree
, newtree
) && /* 18 and 19 */
2510 same(current
, newtree
))) {
2511 return keep_entry(current
, o
);
2512 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2514 return deleted_entry(oldtree
, current
, o
);
2515 } else if (oldtree
&& newtree
&&
2516 same(current
, oldtree
) && !same(current
, newtree
)) {
2518 return merged_entry(newtree
, current
, o
);
2520 return reject_merge(current
, o
);
2523 if (oldtree
&& !o
->initial_checkout
) {
2525 * deletion of the path was staged;
2527 if (same(oldtree
, newtree
))
2529 return reject_merge(oldtree
, o
);
2531 return merged_entry(newtree
, current
, o
);
2533 return deleted_entry(oldtree
, current
, o
);
2539 * Keep the index entries at stage0, collapse stage1 but make sure
2540 * stage0 does not have anything there.
2542 int bind_merge(const struct cache_entry
* const *src
,
2543 struct unpack_trees_options
*o
)
2545 const struct cache_entry
*old
= src
[0];
2546 const struct cache_entry
*a
= src
[1];
2548 if (o
->merge_size
!= 1)
2549 return error("Cannot do a bind merge of %d trees",
2552 return o
->quiet
? -1 :
2553 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2554 super_prefixed(a
->name
),
2555 super_prefixed(old
->name
));
2557 return keep_entry(old
, o
);
2559 return merged_entry(a
, NULL
, o
);
2566 * - take the stat information from stage0, take the data from stage1
2568 int oneway_merge(const struct cache_entry
* const *src
,
2569 struct unpack_trees_options
*o
)
2571 const struct cache_entry
*old
= src
[0];
2572 const struct cache_entry
*a
= src
[1];
2574 if (o
->merge_size
!= 1)
2575 return error("Cannot do a oneway merge of %d trees",
2578 if (!a
|| a
== o
->df_conflict_entry
)
2579 return deleted_entry(old
, old
, o
);
2581 if (old
&& same(old
, a
)) {
2583 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
) &&
2584 !(old
->ce_flags
& CE_FSMONITOR_VALID
)) {
2586 if (lstat(old
->name
, &st
) ||
2587 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2588 update
|= CE_UPDATE
;
2590 if (o
->update
&& S_ISGITLINK(old
->ce_mode
) &&
2591 should_update_submodules() && !verify_uptodate(old
, o
))
2592 update
|= CE_UPDATE
;
2593 add_entry(o
, old
, update
, CE_STAGEMASK
);
2596 return merged_entry(a
, old
, o
);
2600 * Merge worktree and untracked entries in a stash entry.
2602 * Ignore all index entries. Collapse remaining trees but make sure that they
2603 * don't have any conflicting files.
2605 int stash_worktree_untracked_merge(const struct cache_entry
* const *src
,
2606 struct unpack_trees_options
*o
)
2608 const struct cache_entry
*worktree
= src
[1];
2609 const struct cache_entry
*untracked
= src
[2];
2611 if (o
->merge_size
!= 2)
2612 BUG("invalid merge_size: %d", o
->merge_size
);
2614 if (worktree
&& untracked
)
2615 return error(_("worktree and untracked commit have duplicate entries: %s"),
2616 super_prefixed(worktree
->name
));
2618 return merged_entry(worktree
? worktree
: untracked
, NULL
, o
);