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 if (ce
->ce_flags
& CE_WT_REMOVE
)
478 BUG("both update and delete flags are set on %s",
480 display_progress(progress
, ++cnt
);
481 ce
->ce_flags
&= ~CE_UPDATE
;
482 errs
|= checkout_entry(ce
, &state
, NULL
, NULL
);
485 stop_progress(&progress
);
487 errs
|= run_parallel_checkout(&state
, pc_workers
, pc_threshold
);
488 errs
|= finish_delayed_checkout(&state
, NULL
);
489 git_attr_set_direction(GIT_ATTR_CHECKIN
);
492 report_collided_checkout(index
);
494 trace_performance_leave("check_updates");
498 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
499 struct unpack_trees_options
*o
);
500 static int verify_absent_sparse(const struct cache_entry
*ce
,
501 enum unpack_trees_error_types
,
502 struct unpack_trees_options
*o
);
504 static int apply_sparse_checkout(struct index_state
*istate
,
505 struct cache_entry
*ce
,
506 struct unpack_trees_options
*o
)
508 int was_skip_worktree
= ce_skip_worktree(ce
);
510 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
511 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
513 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
514 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
515 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
516 mark_fsmonitor_invalid(istate
, ce
);
517 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
521 * if (!was_skip_worktree && !ce_skip_worktree()) {
522 * This is perfectly normal. Move on;
527 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
528 * area as a result of ce_skip_worktree() shortcuts in
529 * verify_absent() and verify_uptodate().
530 * Make sure they don't modify worktree if they are already
531 * outside checkout area
533 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
534 ce
->ce_flags
&= ~CE_UPDATE
;
537 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
538 * on to get that file removed from both index and worktree.
539 * If that file is already outside worktree area, don't
542 if (ce
->ce_flags
& CE_REMOVE
)
543 ce
->ce_flags
&= ~CE_WT_REMOVE
;
546 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
548 * If CE_UPDATE is set, verify_uptodate() must be called already
549 * also stat info may have lost after merged_entry() so calling
550 * verify_uptodate() again may fail
552 if (!(ce
->ce_flags
& CE_UPDATE
) &&
553 verify_uptodate_sparse(ce
, o
)) {
554 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
557 ce
->ce_flags
|= CE_WT_REMOVE
;
558 ce
->ce_flags
&= ~CE_UPDATE
;
560 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
561 if (verify_absent_sparse(ce
, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
, o
))
563 ce
->ce_flags
|= CE_UPDATE
;
568 static int warn_conflicted_path(struct index_state
*istate
,
570 struct unpack_trees_options
*o
)
572 char *conflicting_path
= istate
->cache
[i
]->name
;
575 add_rejected_path(o
, WARNING_SPARSE_UNMERGED_FILE
, conflicting_path
);
577 /* Find out how many higher stage entries are at same path */
578 while ((++count
) + i
< istate
->cache_nr
&&
579 !strcmp(conflicting_path
, istate
->cache
[count
+ i
]->name
))
585 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
586 struct unpack_trees_options
*o
)
588 int ret
= o
->fn(src
, o
);
594 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
596 ce
->ce_flags
|= CE_UNPACKED
;
598 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
599 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
600 int bottom
= o
->cache_bottom
;
601 while (bottom
< o
->src_index
->cache_nr
&&
602 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
604 o
->cache_bottom
= bottom
;
608 static void mark_all_ce_unused(struct index_state
*index
)
611 for (i
= 0; i
< index
->cache_nr
; i
++)
612 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
615 static int locate_in_src_index(const struct cache_entry
*ce
,
616 struct unpack_trees_options
*o
)
618 struct index_state
*index
= o
->src_index
;
619 int len
= ce_namelen(ce
);
620 int pos
= index_name_pos(index
, ce
->name
, len
);
627 * We call unpack_index_entry() with an unmerged cache entry
628 * only in diff-index, and it wants a single callback. Skip
629 * the other unmerged entry with the same name.
631 static void mark_ce_used_same_name(struct cache_entry
*ce
,
632 struct unpack_trees_options
*o
)
634 struct index_state
*index
= o
->src_index
;
635 int len
= ce_namelen(ce
);
638 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
639 struct cache_entry
*next
= index
->cache
[pos
];
640 if (len
!= ce_namelen(next
) ||
641 memcmp(ce
->name
, next
->name
, len
))
643 mark_ce_used(next
, o
);
647 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
649 const struct index_state
*index
= o
->src_index
;
650 int pos
= o
->cache_bottom
;
652 while (pos
< index
->cache_nr
) {
653 struct cache_entry
*ce
= index
->cache
[pos
];
654 if (!(ce
->ce_flags
& CE_UNPACKED
))
661 static void add_same_unmerged(const struct cache_entry
*ce
,
662 struct unpack_trees_options
*o
)
664 struct index_state
*index
= o
->src_index
;
665 int len
= ce_namelen(ce
);
666 int pos
= index_name_pos(index
, ce
->name
, len
);
669 die("programming error in a caller of mark_ce_used_same_name");
670 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
671 struct cache_entry
*next
= index
->cache
[pos
];
672 if (len
!= ce_namelen(next
) ||
673 memcmp(ce
->name
, next
->name
, len
))
675 add_entry(o
, next
, 0, 0);
676 mark_ce_used(next
, o
);
680 static int unpack_index_entry(struct cache_entry
*ce
,
681 struct unpack_trees_options
*o
)
683 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
690 if (o
->skip_unmerged
) {
691 add_entry(o
, ce
, 0, 0);
695 ret
= call_unpack_fn(src
, o
);
697 mark_ce_used_same_name(ce
, o
);
701 static int find_cache_pos(struct traverse_info
*, const char *p
, size_t len
);
703 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
705 struct unpack_trees_options
*o
= info
->data
;
707 if (o
->diff_index_cached
)
709 o
->cache_bottom
= bottom
;
712 static int switch_cache_bottom(struct traverse_info
*info
)
714 struct unpack_trees_options
*o
= info
->data
;
717 if (o
->diff_index_cached
)
719 ret
= o
->cache_bottom
;
720 pos
= find_cache_pos(info
->prev
, info
->name
, info
->namelen
);
723 o
->cache_bottom
= -2 - pos
;
725 o
->cache_bottom
= o
->src_index
->cache_nr
;
729 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
731 return !is_null_oid(&name_j
->oid
) && !is_null_oid(&name_k
->oid
) && oideq(&name_j
->oid
, &name_k
->oid
);
734 static int all_trees_same_as_cache_tree(int n
, unsigned long dirmask
,
735 struct name_entry
*names
,
736 struct traverse_info
*info
)
738 struct unpack_trees_options
*o
= info
->data
;
741 if (!o
->merge
|| dirmask
!= ((1 << n
) - 1))
744 for (i
= 1; i
< n
; i
++)
745 if (!are_same_oid(names
, names
+ i
))
748 return cache_tree_matches_traversal(o
->src_index
->cache_tree
, names
, info
);
751 static int index_pos_by_traverse_info(struct name_entry
*names
,
752 struct traverse_info
*info
)
754 struct unpack_trees_options
*o
= info
->data
;
755 struct strbuf name
= STRBUF_INIT
;
758 strbuf_make_traverse_path(&name
, info
, names
->path
, names
->pathlen
);
759 strbuf_addch(&name
, '/');
760 pos
= index_name_pos(o
->src_index
, name
.buf
, name
.len
);
762 BUG("This is a directory and should not exist in index");
764 if (pos
>= o
->src_index
->cache_nr
||
765 !starts_with(o
->src_index
->cache
[pos
]->name
, name
.buf
) ||
766 (pos
> 0 && starts_with(o
->src_index
->cache
[pos
-1]->name
, name
.buf
)))
767 BUG("pos %d doesn't point to the first entry of %s in index",
769 strbuf_release(&name
);
774 * Fast path if we detect that all trees are the same as cache-tree at this
775 * path. We'll walk these trees in an iterative loop using cache-tree/index
776 * instead of ODB since we already know what these trees contain.
778 static int traverse_by_cache_tree(int pos
, int nr_entries
, int nr_names
,
779 struct traverse_info
*info
)
781 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
782 struct unpack_trees_options
*o
= info
->data
;
783 struct cache_entry
*tree_ce
= NULL
;
788 BUG("We need cache-tree to do this optimization");
791 * Do what unpack_callback() and unpack_nondirectories() normally
792 * do. But we walk all paths in an iterative loop instead.
794 * D/F conflicts and higher stage entries are not a concern
795 * because cache-tree would be invalidated and we would never
796 * get here in the first place.
798 for (i
= 0; i
< nr_entries
; i
++) {
799 int new_ce_len
, len
, rc
;
801 src
[0] = o
->src_index
->cache
[pos
+ i
];
803 len
= ce_namelen(src
[0]);
804 new_ce_len
= cache_entry_size(len
);
806 if (new_ce_len
> ce_len
) {
808 tree_ce
= xrealloc(tree_ce
, new_ce_len
);
809 memset(tree_ce
, 0, new_ce_len
);
812 tree_ce
->ce_flags
= create_ce_flags(0);
814 for (d
= 1; d
<= nr_names
; d
++)
818 tree_ce
->ce_mode
= src
[0]->ce_mode
;
819 tree_ce
->ce_namelen
= len
;
820 oidcpy(&tree_ce
->oid
, &src
[0]->oid
);
821 memcpy(tree_ce
->name
, src
[0]->name
, len
+ 1);
823 rc
= call_unpack_fn((const struct cache_entry
* const *)src
, o
);
829 mark_ce_used(src
[0], o
);
833 printf("Unpacked %d entries from %s to %s using cache-tree\n",
835 o
->src_index
->cache
[pos
]->name
,
836 o
->src_index
->cache
[pos
+ nr_entries
- 1]->name
);
840 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
841 unsigned long df_conflicts
,
842 struct name_entry
*names
,
843 struct traverse_info
*info
)
845 struct unpack_trees_options
*o
= info
->data
;
848 struct tree_desc t
[MAX_UNPACK_TREES
];
849 void *buf
[MAX_UNPACK_TREES
];
850 struct traverse_info newinfo
;
851 struct name_entry
*p
;
854 nr_entries
= all_trees_same_as_cache_tree(n
, dirmask
, names
, info
);
855 if (nr_entries
> 0) {
856 int pos
= index_pos_by_traverse_info(names
, info
);
858 if (!o
->merge
|| df_conflicts
)
859 BUG("Wrong condition to get here buddy");
862 * All entries up to 'pos' must have been processed
863 * (i.e. marked CE_UNPACKED) at this point. But to be safe,
864 * save and restore cache_bottom anyway to not miss
865 * unprocessed entries before 'pos'.
867 bottom
= o
->cache_bottom
;
868 ret
= traverse_by_cache_tree(pos
, nr_entries
, n
, info
);
869 o
->cache_bottom
= bottom
;
879 newinfo
.pathspec
= info
->pathspec
;
880 newinfo
.name
= p
->path
;
881 newinfo
.namelen
= p
->pathlen
;
882 newinfo
.mode
= p
->mode
;
883 newinfo
.pathlen
= st_add3(newinfo
.pathlen
, tree_entry_len(p
), 1);
884 newinfo
.df_conflicts
|= df_conflicts
;
887 * Fetch the tree from the ODB for each peer directory in the
890 * For 2- and 3-way traversals, we try to avoid hitting the
891 * ODB twice for the same OID. This should yield a nice speed
892 * up in checkouts and merges when the commits are similar.
894 * We don't bother doing the full O(n^2) search for larger n,
895 * because wider traversals don't happen that often and we
896 * avoid the search setup.
898 * When 2 peer OIDs are the same, we just copy the tree
899 * descriptor data. This implicitly borrows the buffer
900 * data from the earlier cell.
902 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
903 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
905 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
908 const struct object_id
*oid
= NULL
;
911 buf
[nr_buf
++] = fill_tree_descriptor(the_repository
, t
+ i
, oid
);
915 bottom
= switch_cache_bottom(&newinfo
);
916 ret
= traverse_trees(o
->src_index
, n
, t
, &newinfo
);
917 restore_cache_bottom(&newinfo
, bottom
);
919 for (i
= 0; i
< nr_buf
; i
++)
926 * Compare the traverse-path to the cache entry without actually
927 * having to generate the textual representation of the traverse
930 * NOTE! This *only* compares up to the size of the traverse path
931 * itself - the caller needs to do the final check for the cache
932 * entry having more data at the end!
934 static int do_compare_entry_piecewise(const struct cache_entry
*ce
,
935 const struct traverse_info
*info
,
936 const char *name
, size_t namelen
,
943 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
944 info
->name
, info
->namelen
,
949 pathlen
= info
->pathlen
;
950 ce_len
= ce_namelen(ce
);
952 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
953 if (ce_len
< pathlen
)
957 ce_name
= ce
->name
+ pathlen
;
959 return df_name_compare(ce_name
, ce_len
, S_IFREG
, name
, namelen
, mode
);
962 static int do_compare_entry(const struct cache_entry
*ce
,
963 const struct traverse_info
*info
,
964 const char *name
, size_t namelen
,
972 * If we have not precomputed the traverse path, it is quicker
973 * to avoid doing so. But if we have precomputed it,
974 * it is quicker to use the precomputed version.
976 if (!info
->traverse_path
)
977 return do_compare_entry_piecewise(ce
, info
, name
, namelen
, mode
);
979 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
983 pathlen
= info
->pathlen
;
984 ce_len
= ce_namelen(ce
);
986 if (ce_len
< pathlen
)
990 ce_name
= ce
->name
+ pathlen
;
992 return df_name_compare(ce_name
, ce_len
, S_IFREG
, name
, namelen
, mode
);
995 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
997 int cmp
= do_compare_entry(ce
, info
, n
->path
, n
->pathlen
, n
->mode
);
1002 * Even if the beginning compared identically, the ce should
1003 * compare as bigger than a directory leading up to it!
1005 return ce_namelen(ce
) > traverse_path_len(info
, tree_entry_len(n
));
1008 static int ce_in_traverse_path(const struct cache_entry
*ce
,
1009 const struct traverse_info
*info
)
1013 if (do_compare_entry(ce
, info
->prev
,
1014 info
->name
, info
->namelen
, info
->mode
))
1017 * If ce (blob) is the same name as the path (which is a tree
1018 * we will be descending into), it won't be inside it.
1020 return (info
->pathlen
< ce_namelen(ce
));
1023 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
,
1024 const struct name_entry
*n
,
1026 struct index_state
*istate
,
1029 size_t len
= traverse_path_len(info
, tree_entry_len(n
));
1030 struct cache_entry
*ce
=
1032 make_empty_transient_cache_entry(len
) :
1033 make_empty_cache_entry(istate
, len
);
1035 ce
->ce_mode
= create_ce_mode(n
->mode
);
1036 ce
->ce_flags
= create_ce_flags(stage
);
1037 ce
->ce_namelen
= len
;
1038 oidcpy(&ce
->oid
, &n
->oid
);
1039 /* len+1 because the cache_entry allocates space for NUL */
1040 make_traverse_path(ce
->name
, len
+ 1, info
, n
->path
, n
->pathlen
);
1046 * Note that traverse_by_cache_tree() duplicates some logic in this function
1047 * without actually calling it. If you change the logic here you may need to
1048 * check and change there as well.
1050 static int unpack_nondirectories(int n
, unsigned long mask
,
1051 unsigned long dirmask
,
1052 struct cache_entry
**src
,
1053 const struct name_entry
*names
,
1054 const struct traverse_info
*info
)
1057 struct unpack_trees_options
*o
= info
->data
;
1058 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
1060 /* Do we have *only* directories? Nothing to do */
1061 if (mask
== dirmask
&& !src
[0])
1065 * Ok, we've filled in up to any potential index entry in src[0],
1068 for (i
= 0; i
< n
; i
++) {
1070 unsigned int bit
= 1ul << i
;
1071 if (conflicts
& bit
) {
1072 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
1079 else if (i
+ 1 < o
->head_idx
)
1081 else if (i
+ 1 > o
->head_idx
)
1087 * If the merge bit is set, then the cache entries are
1088 * discarded in the following block. In this case,
1089 * construct "transient" cache_entries, as they are
1090 * not stored in the index. otherwise construct the
1091 * cache entry from the index aware logic.
1093 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
, &o
->result
, o
->merge
);
1097 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
1099 for (i
= 0; i
< n
; i
++) {
1100 struct cache_entry
*ce
= src
[i
+ o
->merge
];
1101 if (ce
!= o
->df_conflict_entry
)
1102 discard_cache_entry(ce
);
1107 for (i
= 0; i
< n
; i
++)
1108 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
1109 if (do_add_entry(o
, src
[i
], 0, 0))
1115 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
1117 discard_index(&o
->result
);
1118 if (!o
->quiet
&& !o
->exiting_early
) {
1120 return error("%s", message
);
1127 * The tree traversal is looking at name p. If we have a matching entry,
1128 * return it. If name p is a directory in the index, do not return
1129 * anything, as we will want to match it when the traversal descends into
1132 static int find_cache_pos(struct traverse_info
*info
,
1133 const char *p
, size_t p_len
)
1136 struct unpack_trees_options
*o
= info
->data
;
1137 struct index_state
*index
= o
->src_index
;
1138 int pfxlen
= info
->pathlen
;
1140 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
1141 const struct cache_entry
*ce
= index
->cache
[pos
];
1142 const char *ce_name
, *ce_slash
;
1145 if (ce
->ce_flags
& CE_UNPACKED
) {
1147 * cache_bottom entry is already unpacked, so
1148 * we can never match it; don't check it
1151 if (pos
== o
->cache_bottom
)
1155 if (!ce_in_traverse_path(ce
, info
)) {
1157 * Check if we can skip future cache checks
1158 * (because we're already past all possible
1159 * entries in the traverse path).
1161 if (info
->traverse_path
) {
1162 if (strncmp(ce
->name
, info
->traverse_path
,
1168 ce_name
= ce
->name
+ pfxlen
;
1169 ce_slash
= strchr(ce_name
, '/');
1171 ce_len
= ce_slash
- ce_name
;
1173 ce_len
= ce_namelen(ce
) - pfxlen
;
1174 cmp
= name_compare(p
, p_len
, ce_name
, ce_len
);
1176 * Exact match; if we have a directory we need to
1177 * delay returning it.
1180 return ce_slash
? -2 - pos
: pos
;
1182 continue; /* keep looking */
1184 * ce_name sorts after p->path; could it be that we
1185 * have files under p->path directory in the index?
1186 * E.g. ce_name == "t-i", and p->path == "t"; we may
1187 * have "t/a" in the index.
1189 if (p_len
< ce_len
&& !memcmp(ce_name
, p
, p_len
) &&
1190 ce_name
[p_len
] < '/')
1191 continue; /* keep looking */
1197 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
1198 const struct name_entry
*p
)
1200 int pos
= find_cache_pos(info
, p
->path
, p
->pathlen
);
1201 struct unpack_trees_options
*o
= info
->data
;
1204 return o
->src_index
->cache
[pos
];
1209 static void debug_path(struct traverse_info
*info
)
1212 debug_path(info
->prev
);
1213 if (*info
->prev
->name
)
1216 printf("%s", info
->name
);
1219 static void debug_name_entry(int i
, struct name_entry
*n
)
1221 printf("ent#%d %06o %s\n", i
,
1222 n
->path
? n
->mode
: 0,
1223 n
->path
? n
->path
: "(missing)");
1226 static void debug_unpack_callback(int n
,
1228 unsigned long dirmask
,
1229 struct name_entry
*names
,
1230 struct traverse_info
*info
)
1233 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
1237 for (i
= 0; i
< n
; i
++)
1238 debug_name_entry(i
, names
+ i
);
1242 * Note that traverse_by_cache_tree() duplicates some logic in this function
1243 * without actually calling it. If you change the logic here you may need to
1244 * check and change there as well.
1246 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
1248 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
1249 struct unpack_trees_options
*o
= info
->data
;
1250 const struct name_entry
*p
= names
;
1252 /* Find first entry with a real name (we could use "mask" too) */
1256 if (o
->debug_unpack
)
1257 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
1259 /* Are we supposed to look at the index too? */
1263 struct cache_entry
*ce
;
1265 if (o
->diff_index_cached
)
1266 ce
= next_cache_entry(o
);
1268 ce
= find_cache_entry(info
, p
);
1272 cmp
= compare_entry(ce
, info
, p
);
1274 if (unpack_index_entry(ce
, o
) < 0)
1275 return unpack_failed(o
, NULL
);
1281 * If we skip unmerged index
1282 * entries, we'll skip this
1283 * entry *and* the tree
1284 * entries associated with it!
1286 if (o
->skip_unmerged
) {
1287 add_same_unmerged(ce
, o
);
1297 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
1300 if (o
->merge
&& src
[0]) {
1301 if (ce_stage(src
[0]))
1302 mark_ce_used_same_name(src
[0], o
);
1304 mark_ce_used(src
[0], o
);
1307 /* Now handle any directories.. */
1309 /* special case: "diff-index --cached" looking at a tree */
1310 if (o
->diff_index_cached
&&
1311 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1313 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1316 * Everything under the name matches; skip the
1317 * entire hierarchy. diff_index_cached codepath
1318 * special cases D/F conflicts in such a way that
1319 * it does not do any look-ahead, so this is safe.
1322 o
->cache_bottom
+= matches
;
1327 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1336 static int clear_ce_flags_1(struct index_state
*istate
,
1337 struct cache_entry
**cache
, int nr
,
1338 struct strbuf
*prefix
,
1339 int select_mask
, int clear_mask
,
1340 struct pattern_list
*pl
,
1341 enum pattern_match_result default_match
,
1344 /* Whole directory matching */
1345 static int clear_ce_flags_dir(struct index_state
*istate
,
1346 struct cache_entry
**cache
, int nr
,
1347 struct strbuf
*prefix
,
1349 int select_mask
, int clear_mask
,
1350 struct pattern_list
*pl
,
1351 enum pattern_match_result default_match
,
1354 struct cache_entry
**cache_end
;
1357 enum pattern_match_result ret
, orig_ret
;
1358 orig_ret
= path_matches_pattern_list(prefix
->buf
, prefix
->len
,
1359 basename
, &dtype
, pl
, istate
);
1361 strbuf_addch(prefix
, '/');
1363 /* If undecided, use matching result of parent dir in defval */
1364 if (orig_ret
== UNDECIDED
)
1365 ret
= default_match
;
1369 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1370 struct cache_entry
*ce
= *cache_end
;
1371 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1375 if (pl
->use_cone_patterns
&& orig_ret
== MATCHED_RECURSIVE
) {
1376 struct cache_entry
**ce
= cache
;
1377 rc
= cache_end
- cache
;
1379 while (ce
< cache_end
) {
1380 (*ce
)->ce_flags
&= ~clear_mask
;
1383 } else if (pl
->use_cone_patterns
&& orig_ret
== NOT_MATCHED
) {
1384 rc
= cache_end
- cache
;
1386 rc
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1388 select_mask
, clear_mask
,
1393 strbuf_setlen(prefix
, prefix
->len
- 1);
1398 * Traverse the index, find every entry that matches according to
1399 * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the
1400 * number of traversed entries.
1402 * If select_mask is non-zero, only entries whose ce_flags has on of
1403 * those bits enabled are traversed.
1405 * cache : pointer to an index entry
1406 * prefix_len : an offset to its path
1408 * The current path ("prefix") including the trailing '/' is
1409 * cache[0]->name[0..(prefix_len-1)]
1410 * Top level path has prefix_len zero.
1412 static int clear_ce_flags_1(struct index_state
*istate
,
1413 struct cache_entry
**cache
, int nr
,
1414 struct strbuf
*prefix
,
1415 int select_mask
, int clear_mask
,
1416 struct pattern_list
*pl
,
1417 enum pattern_match_result default_match
,
1420 struct cache_entry
**cache_end
= nr
? cache
+ nr
: cache
;
1423 * Process all entries that have the given prefix and meet
1424 * select_mask condition
1426 while(cache
!= cache_end
) {
1427 struct cache_entry
*ce
= *cache
;
1428 const char *name
, *slash
;
1430 enum pattern_match_result ret
;
1432 display_progress(istate
->progress
, progress_nr
);
1434 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1440 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1443 name
= ce
->name
+ prefix
->len
;
1444 slash
= strchr(name
, '/');
1446 /* If it's a directory, try whole directory match first */
1451 strbuf_add(prefix
, name
, len
);
1453 processed
= clear_ce_flags_dir(istate
, cache
, cache_end
- cache
,
1455 prefix
->buf
+ prefix
->len
- len
,
1456 select_mask
, clear_mask
,
1460 /* clear_c_f_dir eats a whole dir already? */
1463 progress_nr
+= processed
;
1464 strbuf_setlen(prefix
, prefix
->len
- len
);
1468 strbuf_addch(prefix
, '/');
1469 processed
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1471 select_mask
, clear_mask
, pl
,
1472 default_match
, progress_nr
);
1475 progress_nr
+= processed
;
1477 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1482 dtype
= ce_to_dtype(ce
);
1483 ret
= path_matches_pattern_list(ce
->name
,
1485 name
, &dtype
, pl
, istate
);
1486 if (ret
== UNDECIDED
)
1487 ret
= default_match
;
1488 if (ret
== MATCHED
|| ret
== MATCHED_RECURSIVE
)
1489 ce
->ce_flags
&= ~clear_mask
;
1494 display_progress(istate
->progress
, progress_nr
);
1495 return nr
- (cache_end
- cache
);
1498 static int clear_ce_flags(struct index_state
*istate
,
1499 int select_mask
, int clear_mask
,
1500 struct pattern_list
*pl
,
1503 static struct strbuf prefix
= STRBUF_INIT
;
1507 strbuf_reset(&prefix
);
1509 istate
->progress
= start_delayed_progress(
1510 _("Updating index flags"),
1513 xsnprintf(label
, sizeof(label
), "clear_ce_flags(0x%08lx,0x%08lx)",
1514 (unsigned long)select_mask
, (unsigned long)clear_mask
);
1515 trace2_region_enter("unpack_trees", label
, the_repository
);
1516 rval
= clear_ce_flags_1(istate
,
1520 select_mask
, clear_mask
,
1522 trace2_region_leave("unpack_trees", label
, the_repository
);
1524 stop_progress(&istate
->progress
);
1529 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1531 static void mark_new_skip_worktree(struct pattern_list
*pl
,
1532 struct index_state
*istate
,
1533 int select_flag
, int skip_wt_flag
,
1539 * 1. Pretend the narrowest worktree: only unmerged entries
1542 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1543 struct cache_entry
*ce
= istate
->cache
[i
];
1545 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1548 if (!ce_stage(ce
) && !(ce
->ce_flags
& CE_CONFLICTED
))
1549 ce
->ce_flags
|= skip_wt_flag
;
1551 ce
->ce_flags
&= ~skip_wt_flag
;
1555 * 2. Widen worktree according to sparse-checkout file.
1556 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1558 clear_ce_flags(istate
, select_flag
, skip_wt_flag
, pl
, show_progress
);
1561 static void populate_from_existing_patterns(struct unpack_trees_options
*o
,
1562 struct pattern_list
*pl
)
1564 if (get_sparse_checkout_patterns(pl
) < 0)
1565 o
->skip_sparse_checkout
= 1;
1571 static int verify_absent(const struct cache_entry
*,
1572 enum unpack_trees_error_types
,
1573 struct unpack_trees_options
*);
1575 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1576 * resulting index, -2 on failure to reflect the changes to the work tree.
1578 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1580 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1583 static struct cache_entry
*dfc
;
1584 struct pattern_list pl
;
1585 int free_pattern_list
= 0;
1587 if (len
> MAX_UNPACK_TREES
)
1588 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1590 trace_performance_enter();
1591 trace2_region_enter("unpack_trees", "unpack_trees", the_repository
);
1593 if (!core_apply_sparse_checkout
|| !o
->update
)
1594 o
->skip_sparse_checkout
= 1;
1595 if (!o
->skip_sparse_checkout
&& !o
->pl
) {
1596 memset(&pl
, 0, sizeof(pl
));
1597 free_pattern_list
= 1;
1598 populate_from_existing_patterns(o
, &pl
);
1601 memset(&o
->result
, 0, sizeof(o
->result
));
1602 o
->result
.initialized
= 1;
1603 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1604 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1605 o
->result
.version
= o
->src_index
->version
;
1606 if (!o
->src_index
->split_index
) {
1607 o
->result
.split_index
= NULL
;
1608 } else if (o
->src_index
== o
->dst_index
) {
1610 * o->dst_index (and thus o->src_index) will be discarded
1611 * and overwritten with o->result at the end of this function,
1612 * so just use src_index's split_index to avoid having to
1615 o
->result
.split_index
= o
->src_index
->split_index
;
1616 o
->result
.split_index
->refcount
++;
1618 o
->result
.split_index
= init_split_index(&o
->result
);
1620 oidcpy(&o
->result
.oid
, &o
->src_index
->oid
);
1621 o
->merge_size
= len
;
1622 mark_all_ce_unused(o
->src_index
);
1624 o
->result
.fsmonitor_last_update
=
1625 xstrdup_or_null(o
->src_index
->fsmonitor_last_update
);
1628 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1630 if (!o
->skip_sparse_checkout
)
1631 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1632 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1635 dfc
= xcalloc(1, cache_entry_size(0));
1636 o
->df_conflict_entry
= dfc
;
1639 const char *prefix
= o
->prefix
? o
->prefix
: "";
1640 struct traverse_info info
;
1642 setup_traverse_info(&info
, prefix
);
1643 info
.fn
= unpack_callback
;
1645 info
.show_all_errors
= o
->show_all_errors
;
1646 info
.pathspec
= o
->pathspec
;
1650 * Unpack existing index entries that sort before the
1651 * prefix the tree is spliced into. Note that o->merge
1652 * is always true in this case.
1655 struct cache_entry
*ce
= next_cache_entry(o
);
1658 if (ce_in_traverse_path(ce
, &info
))
1660 if (unpack_index_entry(ce
, o
) < 0)
1665 trace_performance_enter();
1666 trace2_region_enter("unpack_trees", "traverse_trees", the_repository
);
1667 ret
= traverse_trees(o
->src_index
, len
, t
, &info
);
1668 trace2_region_leave("unpack_trees", "traverse_trees", the_repository
);
1669 trace_performance_leave("traverse_trees");
1674 /* Any left-over entries in the index? */
1677 struct cache_entry
*ce
= next_cache_entry(o
);
1680 if (unpack_index_entry(ce
, o
) < 0)
1684 mark_all_ce_unused(o
->src_index
);
1686 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1687 ret
= unpack_failed(o
, "Merge requires file-level merging");
1691 if (!o
->skip_sparse_checkout
) {
1693 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1694 * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1695 * so apply_sparse_checkout() won't attempt to remove it from worktree
1697 mark_new_skip_worktree(o
->pl
, &o
->result
,
1698 CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
,
1702 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1703 struct cache_entry
*ce
= o
->result
.cache
[i
];
1706 * Entries marked with CE_ADDED in merged_entry() do not have
1707 * verify_absent() check (the check is effectively disabled
1708 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1710 * Do the real check now because we have had
1711 * correct CE_NEW_SKIP_WORKTREE
1713 if (ce
->ce_flags
& CE_ADDED
&&
1714 verify_absent(ce
, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
, o
))
1717 if (apply_sparse_checkout(&o
->result
, ce
, o
))
1722 * Inability to sparsify or de-sparsify individual
1723 * paths is not an error, but just a warning.
1725 if (o
->show_all_errors
)
1726 display_warning_msgs(o
);
1731 ret
= check_updates(o
, &o
->result
) ? (-2) : 0;
1733 move_index_extensions(&o
->result
, o
->src_index
);
1735 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
1736 cache_tree_verify(the_repository
, &o
->result
);
1737 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1738 cache_tree_update(&o
->result
,
1743 o
->result
.updated_workdir
= 1;
1744 discard_index(o
->dst_index
);
1745 *o
->dst_index
= o
->result
;
1747 discard_index(&o
->result
);
1749 o
->src_index
= NULL
;
1752 if (free_pattern_list
)
1753 clear_pattern_list(&pl
);
1754 trace2_region_leave("unpack_trees", "unpack_trees", the_repository
);
1755 trace_performance_leave("unpack_trees");
1759 if (o
->show_all_errors
)
1760 display_error_msgs(o
);
1761 mark_all_ce_unused(o
->src_index
);
1762 ret
= unpack_failed(o
, NULL
);
1763 if (o
->exiting_early
)
1769 * Update SKIP_WORKTREE bits according to sparsity patterns, and update
1770 * working directory to match.
1772 * CE_NEW_SKIP_WORKTREE is used internally.
1774 enum update_sparsity_result
update_sparsity(struct unpack_trees_options
*o
)
1776 enum update_sparsity_result ret
= UPDATE_SPARSITY_SUCCESS
;
1777 struct pattern_list pl
;
1779 unsigned old_show_all_errors
;
1780 int free_pattern_list
= 0;
1782 old_show_all_errors
= o
->show_all_errors
;
1783 o
->show_all_errors
= 1;
1786 if (!o
->update
|| o
->index_only
|| o
->skip_sparse_checkout
)
1787 BUG("update_sparsity() is for reflecting sparsity patterns in working directory");
1788 if (o
->src_index
!= o
->dst_index
|| o
->fn
)
1789 BUG("update_sparsity() called wrong");
1791 trace_performance_enter();
1793 /* If we weren't given patterns, use the recorded ones */
1795 memset(&pl
, 0, sizeof(pl
));
1796 free_pattern_list
= 1;
1797 populate_from_existing_patterns(o
, &pl
);
1798 if (o
->skip_sparse_checkout
)
1799 goto skip_sparse_checkout
;
1802 /* Set NEW_SKIP_WORKTREE on existing entries. */
1803 mark_all_ce_unused(o
->src_index
);
1804 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1805 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1807 /* Then loop over entries and update/remove as needed */
1808 ret
= UPDATE_SPARSITY_SUCCESS
;
1809 for (i
= 0; i
< o
->src_index
->cache_nr
; i
++) {
1810 struct cache_entry
*ce
= o
->src_index
->cache
[i
];
1814 /* -1 because for loop will increment by 1 */
1815 i
+= warn_conflicted_path(o
->src_index
, i
, o
) - 1;
1816 ret
= UPDATE_SPARSITY_WARNINGS
;
1820 if (apply_sparse_checkout(o
->src_index
, ce
, o
))
1821 ret
= UPDATE_SPARSITY_WARNINGS
;
1824 skip_sparse_checkout
:
1825 if (check_updates(o
, o
->src_index
))
1826 ret
= UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES
;
1828 display_warning_msgs(o
);
1829 o
->show_all_errors
= old_show_all_errors
;
1830 if (free_pattern_list
)
1831 clear_pattern_list(&pl
);
1832 trace_performance_leave("update_sparsity");
1836 /* Here come the merge functions */
1838 static int reject_merge(const struct cache_entry
*ce
,
1839 struct unpack_trees_options
*o
)
1841 return add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1844 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1850 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1852 return a
->ce_mode
== b
->ce_mode
&&
1853 oideq(&a
->oid
, &b
->oid
);
1858 * When a CE gets turned into an unmerged entry, we
1859 * want it to be up-to-date
1861 static int verify_uptodate_1(const struct cache_entry
*ce
,
1862 struct unpack_trees_options
*o
,
1863 enum unpack_trees_error_types error_type
)
1871 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1872 * if this entry is truly up-to-date because this file may be
1875 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1876 ; /* keep checking */
1877 else if (o
->reset
|| ce_uptodate(ce
))
1880 if (!lstat(ce
->name
, &st
)) {
1881 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1882 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1884 if (submodule_from_ce(ce
)) {
1885 int r
= check_submodule_move_head(ce
,
1886 "HEAD", oid_to_hex(&ce
->oid
), o
);
1888 return add_rejected_path(o
, error_type
, ce
->name
);
1895 * Historic default policy was to allow submodule to be out
1896 * of sync wrt the superproject index. If the submodule was
1897 * not considered interesting above, we don't care here.
1899 if (S_ISGITLINK(ce
->ce_mode
))
1904 if (errno
== ENOENT
)
1906 return add_rejected_path(o
, error_type
, ce
->name
);
1909 int verify_uptodate(const struct cache_entry
*ce
,
1910 struct unpack_trees_options
*o
)
1912 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1914 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1917 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1918 struct unpack_trees_options
*o
)
1920 return verify_uptodate_1(ce
, o
, WARNING_SPARSE_NOT_UPTODATE_FILE
);
1924 * TODO: We should actually invalidate o->result, not src_index [1].
1925 * But since cache tree and untracked cache both are not copied to
1926 * o->result until unpacking is complete, we invalidate them on
1927 * src_index instead with the assumption that they will be copied to
1928 * dst_index at the end.
1930 * [1] src_index->cache_tree is also used in unpack_callback() so if
1931 * we invalidate o->result, we need to update it to use
1932 * o->result.cache_tree as well.
1934 static void invalidate_ce_path(const struct cache_entry
*ce
,
1935 struct unpack_trees_options
*o
)
1939 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1940 untracked_cache_invalidate_path(o
->src_index
, ce
->name
, 1);
1944 * Check that checking out ce->sha1 in subdir ce->name is not
1945 * going to overwrite any working files.
1947 static int verify_clean_submodule(const char *old_sha1
,
1948 const struct cache_entry
*ce
,
1949 struct unpack_trees_options
*o
)
1951 if (!submodule_from_ce(ce
))
1954 return check_submodule_move_head(ce
, old_sha1
,
1955 oid_to_hex(&ce
->oid
), o
);
1958 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1959 struct unpack_trees_options
*o
)
1962 * we are about to extract "ce->name"; we would not want to lose
1963 * anything in the existing directory there.
1967 struct dir_struct d
;
1971 if (S_ISGITLINK(ce
->ce_mode
)) {
1972 struct object_id oid
;
1973 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", &oid
);
1975 * If we are not going to update the submodule, then
1978 if (!sub_head
&& oideq(&oid
, &ce
->oid
))
1980 return verify_clean_submodule(sub_head
? NULL
: oid_to_hex(&oid
),
1985 * First let's make sure we do not have a local modification
1986 * in that directory.
1988 namelen
= ce_namelen(ce
);
1989 for (i
= locate_in_src_index(ce
, o
);
1990 i
< o
->src_index
->cache_nr
;
1992 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1993 int len
= ce_namelen(ce2
);
1994 if (len
< namelen
||
1995 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1996 ce2
->name
[namelen
] != '/')
1999 * ce2->name is an entry in the subdirectory to be
2002 if (!ce_stage(ce2
)) {
2003 if (verify_uptodate(ce2
, o
))
2005 add_entry(o
, ce2
, CE_REMOVE
, 0);
2006 invalidate_ce_path(ce
, o
);
2007 mark_ce_used(ce2
, o
);
2013 * Then we need to make sure that we do not lose a locally
2014 * present file that is not ignored.
2016 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
2018 memset(&d
, 0, sizeof(d
));
2020 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
2021 i
= read_directory(&d
, o
->src_index
, pathbuf
, namelen
+1, NULL
);
2023 return add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
2029 * This gets called when there was no index entry for the tree entry 'dst',
2030 * but we found a file in the working tree that 'lstat()' said was fine,
2031 * and we're on a case-insensitive filesystem.
2033 * See if we can find a case-insensitive match in the index that also
2034 * matches the stat information, and assume it's that other file!
2036 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
2038 const struct cache_entry
*src
;
2040 src
= index_file_exists(o
->src_index
, name
, len
, 1);
2041 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
2044 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
2045 const struct cache_entry
*ce
, struct stat
*st
,
2046 enum unpack_trees_error_types error_type
,
2047 struct unpack_trees_options
*o
)
2049 const struct cache_entry
*result
;
2052 * It may be that the 'lstat()' succeeded even though
2053 * target 'ce' was absent, because there is an old
2054 * entry that is different only in case..
2056 * Ignore that lstat() if it matches.
2058 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
2062 is_excluded(o
->dir
, o
->src_index
, name
, &dtype
))
2064 * ce->name is explicitly excluded, so it is Ok to
2068 if (S_ISDIR(st
->st_mode
)) {
2070 * We are checking out path "foo" and
2071 * found "foo/." in the working tree.
2072 * This is tricky -- if we have modified
2073 * files that are in "foo/" we would lose
2076 if (verify_clean_subdirectory(ce
, o
) < 0)
2082 * The previous round may already have decided to
2083 * delete this path, which is in a subdirectory that
2084 * is being replaced with a blob.
2086 result
= index_file_exists(&o
->result
, name
, len
, 0);
2088 if (result
->ce_flags
& CE_REMOVE
)
2092 return add_rejected_path(o
, error_type
, name
);
2096 * We do not want to remove or overwrite a working tree file that
2097 * is not tracked, unless it is ignored.
2099 static int verify_absent_1(const struct cache_entry
*ce
,
2100 enum unpack_trees_error_types error_type
,
2101 struct unpack_trees_options
*o
)
2106 if (o
->index_only
|| o
->reset
|| !o
->update
)
2109 len
= check_leading_path(ce
->name
, ce_namelen(ce
), 0);
2116 path
= xmemdupz(ce
->name
, len
);
2117 if (lstat(path
, &st
))
2118 ret
= error_errno("cannot stat '%s'", path
);
2120 if (submodule_from_ce(ce
))
2121 ret
= check_submodule_move_head(ce
,
2122 oid_to_hex(&ce
->oid
),
2125 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
2126 &st
, error_type
, o
);
2130 } else if (lstat(ce
->name
, &st
)) {
2131 if (errno
!= ENOENT
)
2132 return error_errno("cannot stat '%s'", ce
->name
);
2135 if (submodule_from_ce(ce
))
2136 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
2139 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
2140 ce_to_dtype(ce
), ce
, &st
,
2145 static int verify_absent(const struct cache_entry
*ce
,
2146 enum unpack_trees_error_types error_type
,
2147 struct unpack_trees_options
*o
)
2149 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
2151 return verify_absent_1(ce
, error_type
, o
);
2154 static int verify_absent_sparse(const struct cache_entry
*ce
,
2155 enum unpack_trees_error_types error_type
,
2156 struct unpack_trees_options
*o
)
2158 return verify_absent_1(ce
, error_type
, o
);
2161 static int merged_entry(const struct cache_entry
*ce
,
2162 const struct cache_entry
*old
,
2163 struct unpack_trees_options
*o
)
2165 int update
= CE_UPDATE
;
2166 struct cache_entry
*merge
= dup_cache_entry(ce
, &o
->result
);
2170 * New index entries. In sparse checkout, the following
2171 * verify_absent() will be delayed until after
2172 * traverse_trees() finishes in unpack_trees(), then:
2174 * - CE_NEW_SKIP_WORKTREE will be computed correctly
2175 * - verify_absent() be called again, this time with
2176 * correct CE_NEW_SKIP_WORKTREE
2178 * verify_absent() call here does nothing in sparse
2179 * checkout (i.e. o->skip_sparse_checkout == 0)
2182 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
2184 if (verify_absent(merge
,
2185 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
2186 discard_cache_entry(merge
);
2189 invalidate_ce_path(merge
, o
);
2191 if (submodule_from_ce(ce
) && file_exists(ce
->name
)) {
2192 int ret
= check_submodule_move_head(ce
, NULL
,
2193 oid_to_hex(&ce
->oid
),
2199 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
2201 * See if we can re-use the old CE directly?
2202 * That way we get the uptodate stat info.
2204 * This also removes the UPDATE flag on a match; otherwise
2205 * we will end up overwriting local changes in the work tree.
2207 if (same(old
, merge
)) {
2208 copy_cache_entry(merge
, old
);
2211 if (verify_uptodate(old
, o
)) {
2212 discard_cache_entry(merge
);
2215 /* Migrate old flags over */
2216 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
2217 invalidate_ce_path(old
, o
);
2220 if (submodule_from_ce(ce
) && file_exists(ce
->name
)) {
2221 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
2222 oid_to_hex(&ce
->oid
),
2229 * Previously unmerged entry left as an existence
2230 * marker by read_index_unmerged();
2232 invalidate_ce_path(old
, o
);
2235 if (do_add_entry(o
, merge
, update
, CE_STAGEMASK
) < 0)
2240 static int deleted_entry(const struct cache_entry
*ce
,
2241 const struct cache_entry
*old
,
2242 struct unpack_trees_options
*o
)
2244 /* Did it exist in the index? */
2246 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2250 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
2252 add_entry(o
, ce
, CE_REMOVE
, 0);
2253 invalidate_ce_path(ce
, o
);
2257 static int keep_entry(const struct cache_entry
*ce
,
2258 struct unpack_trees_options
*o
)
2260 add_entry(o
, ce
, 0, 0);
2262 invalidate_ce_path(ce
, o
);
2267 static void show_stage_entry(FILE *o
,
2268 const char *label
, const struct cache_entry
*ce
)
2271 fprintf(o
, "%s (missing)\n", label
);
2273 fprintf(o
, "%s%06o %s %d\t%s\n",
2276 oid_to_hex(&ce
->oid
),
2282 int threeway_merge(const struct cache_entry
* const *stages
,
2283 struct unpack_trees_options
*o
)
2285 const struct cache_entry
*index
;
2286 const struct cache_entry
*head
;
2287 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
2290 int remote_match
= 0;
2292 int df_conflict_head
= 0;
2293 int df_conflict_remote
= 0;
2295 int any_anc_missing
= 0;
2296 int no_anc_exists
= 1;
2299 for (i
= 1; i
< o
->head_idx
; i
++) {
2300 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
2301 any_anc_missing
= 1;
2307 head
= stages
[o
->head_idx
];
2309 if (head
== o
->df_conflict_entry
) {
2310 df_conflict_head
= 1;
2314 if (remote
== o
->df_conflict_entry
) {
2315 df_conflict_remote
= 1;
2320 * First, if there's a #16 situation, note that to prevent #13
2323 if (!same(remote
, head
)) {
2324 for (i
= 1; i
< o
->head_idx
; i
++) {
2325 if (same(stages
[i
], head
)) {
2328 if (same(stages
[i
], remote
)) {
2335 * We start with cases where the index is allowed to match
2336 * something other than the head: #14(ALT) and #2ALT, where it
2337 * is permitted to match the result instead.
2339 /* #14, #14ALT, #2ALT */
2340 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
2341 if (index
&& !same(index
, remote
) && !same(index
, head
))
2342 return reject_merge(index
, o
);
2343 return merged_entry(remote
, index
, o
);
2346 * If we have an entry in the index cache, then we want to
2347 * make sure that it matches head.
2349 if (index
&& !same(index
, head
))
2350 return reject_merge(index
, o
);
2354 if (same(head
, remote
))
2355 return merged_entry(head
, index
, o
);
2357 if (!df_conflict_remote
&& remote_match
&& !head_match
)
2358 return merged_entry(head
, index
, o
);
2362 if (!head
&& !remote
&& any_anc_missing
)
2366 * Under the "aggressive" rule, we resolve mostly trivial
2367 * cases that we historically had git-merge-one-file resolve.
2369 if (o
->aggressive
) {
2370 int head_deleted
= !head
;
2371 int remote_deleted
= !remote
;
2372 const struct cache_entry
*ce
= NULL
;
2381 for (i
= 1; i
< o
->head_idx
; i
++) {
2382 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2391 * Deleted in one and unchanged in the other.
2393 if ((head_deleted
&& remote_deleted
) ||
2394 (head_deleted
&& remote
&& remote_match
) ||
2395 (remote_deleted
&& head
&& head_match
)) {
2397 return deleted_entry(index
, index
, o
);
2398 if (ce
&& !head_deleted
) {
2399 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2405 * Added in both, identically.
2407 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
2408 return merged_entry(head
, index
, o
);
2412 /* Below are "no merge" cases, which require that the index be
2413 * up-to-date to avoid the files getting overwritten with
2414 * conflict resolution files.
2417 if (verify_uptodate(index
, o
))
2421 o
->nontrivial_merge
= 1;
2423 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2425 if (!head_match
|| !remote_match
) {
2426 for (i
= 1; i
< o
->head_idx
; i
++) {
2427 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2428 keep_entry(stages
[i
], o
);
2436 fprintf(stderr
, "read-tree: warning #16 detected\n");
2437 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2438 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2441 if (head
) { count
+= keep_entry(head
, o
); }
2442 if (remote
) { count
+= keep_entry(remote
, o
); }
2449 * The rule is to "carry forward" what is in the index without losing
2450 * information across a "fast-forward", favoring a successful merge
2451 * over a merge failure when it makes sense. For details of the
2452 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2455 int twoway_merge(const struct cache_entry
* const *src
,
2456 struct unpack_trees_options
*o
)
2458 const struct cache_entry
*current
= src
[0];
2459 const struct cache_entry
*oldtree
= src
[1];
2460 const struct cache_entry
*newtree
= src
[2];
2462 if (o
->merge_size
!= 2)
2463 return error("Cannot do a twoway merge of %d trees",
2466 if (oldtree
== o
->df_conflict_entry
)
2468 if (newtree
== o
->df_conflict_entry
)
2472 if (current
->ce_flags
& CE_CONFLICTED
) {
2473 if (same(oldtree
, newtree
) || o
->reset
) {
2475 return deleted_entry(current
, current
, o
);
2477 return merged_entry(newtree
, current
, o
);
2479 return reject_merge(current
, o
);
2480 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2481 (!oldtree
&& newtree
&&
2482 same(current
, newtree
)) || /* 6 and 7 */
2483 (oldtree
&& newtree
&&
2484 same(oldtree
, newtree
)) || /* 14 and 15 */
2485 (oldtree
&& newtree
&&
2486 !same(oldtree
, newtree
) && /* 18 and 19 */
2487 same(current
, newtree
))) {
2488 return keep_entry(current
, o
);
2489 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2491 return deleted_entry(oldtree
, current
, o
);
2492 } else if (oldtree
&& newtree
&&
2493 same(current
, oldtree
) && !same(current
, newtree
)) {
2495 return merged_entry(newtree
, current
, o
);
2497 return reject_merge(current
, o
);
2500 if (oldtree
&& !o
->initial_checkout
) {
2502 * deletion of the path was staged;
2504 if (same(oldtree
, newtree
))
2506 return reject_merge(oldtree
, o
);
2508 return merged_entry(newtree
, current
, o
);
2510 return deleted_entry(oldtree
, current
, o
);
2516 * Keep the index entries at stage0, collapse stage1 but make sure
2517 * stage0 does not have anything there.
2519 int bind_merge(const struct cache_entry
* const *src
,
2520 struct unpack_trees_options
*o
)
2522 const struct cache_entry
*old
= src
[0];
2523 const struct cache_entry
*a
= src
[1];
2525 if (o
->merge_size
!= 1)
2526 return error("Cannot do a bind merge of %d trees",
2529 return o
->quiet
? -1 :
2530 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2531 super_prefixed(a
->name
),
2532 super_prefixed(old
->name
));
2534 return keep_entry(old
, o
);
2536 return merged_entry(a
, NULL
, o
);
2543 * - take the stat information from stage0, take the data from stage1
2545 int oneway_merge(const struct cache_entry
* const *src
,
2546 struct unpack_trees_options
*o
)
2548 const struct cache_entry
*old
= src
[0];
2549 const struct cache_entry
*a
= src
[1];
2551 if (o
->merge_size
!= 1)
2552 return error("Cannot do a oneway merge of %d trees",
2555 if (!a
|| a
== o
->df_conflict_entry
)
2556 return deleted_entry(old
, old
, o
);
2558 if (old
&& same(old
, a
)) {
2560 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
) &&
2561 !(old
->ce_flags
& CE_FSMONITOR_VALID
)) {
2563 if (lstat(old
->name
, &st
) ||
2564 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2565 update
|= CE_UPDATE
;
2567 if (o
->update
&& S_ISGITLINK(old
->ce_mode
) &&
2568 should_update_submodules() && !verify_uptodate(old
, o
))
2569 update
|= CE_UPDATE
;
2570 add_entry(o
, old
, update
, CE_STAGEMASK
);
2573 return merged_entry(a
, old
, o
);
2577 * Merge worktree and untracked entries in a stash entry.
2579 * Ignore all index entries. Collapse remaining trees but make sure that they
2580 * don't have any conflicting files.
2582 int stash_worktree_untracked_merge(const struct cache_entry
* const *src
,
2583 struct unpack_trees_options
*o
)
2585 const struct cache_entry
*worktree
= src
[1];
2586 const struct cache_entry
*untracked
= src
[2];
2588 if (o
->merge_size
!= 2)
2589 BUG("invalid merge_size: %d", o
->merge_size
);
2591 if (worktree
&& untracked
)
2592 return error(_("worktree and untracked commit have duplicate entries: %s"),
2593 super_prefixed(worktree
->name
));
2595 return merged_entry(worktree
? worktree
: untracked
, NULL
, o
);