2 #include "argv-array.h"
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"
21 * Error messages expected by scripts out of plumbing commands such as
22 * read-tree. Non-scripted Porcelain is not required to use these messages
23 * and in fact are encouraged to reword them to better suit their particular
24 * situation better. See how "git checkout" and "git merge" replaces
25 * them using setup_unpack_trees_porcelain(), for example.
27 static const char *unpack_plumbing_errors
[NB_UNPACK_TREES_WARNING_TYPES
] = {
28 /* ERROR_WOULD_OVERWRITE */
29 "Entry '%s' would be overwritten by merge. Cannot merge.",
31 /* ERROR_NOT_UPTODATE_FILE */
32 "Entry '%s' not uptodate. Cannot merge.",
34 /* ERROR_NOT_UPTODATE_DIR */
35 "Updating '%s' would lose untracked files in it",
37 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
38 "Untracked working tree file '%s' would be overwritten by merge.",
40 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
41 "Untracked working tree file '%s' would be removed by merge.",
43 /* ERROR_BIND_OVERLAP */
44 "Entry '%s' overlaps with '%s'. Cannot bind.",
46 /* ERROR_WOULD_LOSE_SUBMODULE */
47 "Submodule '%s' cannot checkout new HEAD.",
49 /* NB_UNPACK_TREES_ERROR_TYPES; just a meta value */
52 /* WARNING_SPARSE_NOT_UPTODATE_FILE */
53 "Path '%s' not uptodate; will not remove from working tree.",
55 /* WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN */
56 "Path '%s' already present; will not overwrite with sparse update.",
59 #define ERRORMSG(o,type) \
60 ( ((o) && (o)->msgs[(type)]) \
61 ? ((o)->msgs[(type)]) \
62 : (unpack_plumbing_errors[(type)]) )
64 static const char *super_prefixed(const char *path
)
67 * It is necessary and sufficient to have two static buffers
68 * here, as the return value of this function is fed to
69 * error() using the unpack_*_errors[] templates we see above.
71 static struct strbuf buf
[2] = {STRBUF_INIT
, STRBUF_INIT
};
72 static int super_prefix_len
= -1;
73 static unsigned idx
= ARRAY_SIZE(buf
) - 1;
75 if (super_prefix_len
< 0) {
76 const char *super_prefix
= get_super_prefix();
81 for (i
= 0; i
< ARRAY_SIZE(buf
); i
++)
82 strbuf_addstr(&buf
[i
], super_prefix
);
83 super_prefix_len
= buf
[0].len
;
87 if (!super_prefix_len
)
90 if (++idx
>= ARRAY_SIZE(buf
))
93 strbuf_setlen(&buf
[idx
], super_prefix_len
);
94 strbuf_addstr(&buf
[idx
], path
);
99 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
103 const char **msgs
= opts
->msgs
;
106 argv_array_init(&opts
->msgs_to_free
);
108 if (!strcmp(cmd
, "checkout"))
109 msg
= advice_commit_before_merge
110 ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
111 "Please commit your changes or stash them before you switch branches.")
112 : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
113 else if (!strcmp(cmd
, "merge"))
114 msg
= advice_commit_before_merge
115 ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
116 "Please commit your changes or stash them before you merge.")
117 : _("Your local changes to the following files would be overwritten by merge:\n%%s");
119 msg
= advice_commit_before_merge
120 ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
121 "Please commit your changes or stash them before you %s.")
122 : _("Your local changes to the following files would be overwritten by %s:\n%%s");
123 msgs
[ERROR_WOULD_OVERWRITE
] = msgs
[ERROR_NOT_UPTODATE_FILE
] =
124 argv_array_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
126 msgs
[ERROR_NOT_UPTODATE_DIR
] =
127 _("Updating the following directories would lose untracked files in them:\n%s");
129 if (!strcmp(cmd
, "checkout"))
130 msg
= advice_commit_before_merge
131 ? _("The following untracked working tree files would be removed by checkout:\n%%s"
132 "Please move or remove them before you switch branches.")
133 : _("The following untracked working tree files would be removed by checkout:\n%%s");
134 else if (!strcmp(cmd
, "merge"))
135 msg
= advice_commit_before_merge
136 ? _("The following untracked working tree files would be removed by merge:\n%%s"
137 "Please move or remove them before you merge.")
138 : _("The following untracked working tree files would be removed by merge:\n%%s");
140 msg
= advice_commit_before_merge
141 ? _("The following untracked working tree files would be removed by %s:\n%%s"
142 "Please move or remove them before you %s.")
143 : _("The following untracked working tree files would be removed by %s:\n%%s");
144 msgs
[ERROR_WOULD_LOSE_UNTRACKED_REMOVED
] =
145 argv_array_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
147 if (!strcmp(cmd
, "checkout"))
148 msg
= advice_commit_before_merge
149 ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
150 "Please move or remove them before you switch branches.")
151 : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
152 else if (!strcmp(cmd
, "merge"))
153 msg
= advice_commit_before_merge
154 ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
155 "Please move or remove them before you merge.")
156 : _("The following untracked working tree files would be overwritten by merge:\n%%s");
158 msg
= advice_commit_before_merge
159 ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
160 "Please move or remove them before you %s.")
161 : _("The following untracked working tree files would be overwritten by %s:\n%%s");
162 msgs
[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
] =
163 argv_array_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
166 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
167 * cannot easily display it as a list.
169 msgs
[ERROR_BIND_OVERLAP
] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
171 msgs
[ERROR_WOULD_LOSE_SUBMODULE
] =
172 _("Cannot update submodule:\n%s");
174 msgs
[WARNING_SPARSE_NOT_UPTODATE_FILE
] =
175 _("The following paths are not up to date and were left despite sparse patterns:\n%s");
176 msgs
[WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
] =
177 _("The following paths were already present and thus not updated despite sparse patterns:\n%s");
179 opts
->show_all_errors
= 1;
180 /* rejected paths may not have a static buffer */
181 for (i
= 0; i
< ARRAY_SIZE(opts
->unpack_rejects
); i
++)
182 opts
->unpack_rejects
[i
].strdup_strings
= 1;
185 void clear_unpack_trees_porcelain(struct unpack_trees_options
*opts
)
187 argv_array_clear(&opts
->msgs_to_free
);
188 memset(opts
->msgs
, 0, sizeof(opts
->msgs
));
191 static int do_add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
192 unsigned int set
, unsigned int clear
)
199 ce
->ce_flags
= (ce
->ce_flags
& ~clear
) | set
;
200 return add_index_entry(&o
->result
, ce
,
201 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
204 static void add_entry(struct unpack_trees_options
*o
,
205 const struct cache_entry
*ce
,
206 unsigned int set
, unsigned int clear
)
208 do_add_entry(o
, dup_cache_entry(ce
, &o
->result
), set
, clear
);
212 * add error messages on path <path>
213 * corresponding to the type <e> with the message <msg>
214 * indicating if it should be display in porcelain or not
216 static int add_rejected_path(struct unpack_trees_options
*o
,
217 enum unpack_trees_error_types e
,
223 if (!o
->show_all_errors
)
224 return error(ERRORMSG(o
, e
), super_prefixed(path
));
227 * Otherwise, insert in a list for future display by
228 * display_(error|warning)_msgs()
230 string_list_append(&o
->unpack_rejects
[e
], path
);
235 * display all the error messages stored in a nice way
237 static void display_error_msgs(struct unpack_trees_options
*o
)
240 unsigned error_displayed
= 0;
241 for (e
= 0; e
< NB_UNPACK_TREES_ERROR_TYPES
; e
++) {
242 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
244 if (rejects
->nr
> 0) {
246 struct strbuf path
= STRBUF_INIT
;
249 for (i
= 0; i
< rejects
->nr
; i
++)
250 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
251 error(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
252 strbuf_release(&path
);
254 string_list_clear(rejects
, 0);
257 fprintf(stderr
, _("Aborting\n"));
261 * display all the warning messages stored in a nice way
263 static void display_warning_msgs(struct unpack_trees_options
*o
)
266 unsigned warning_displayed
= 0;
267 for (e
= NB_UNPACK_TREES_ERROR_TYPES
+ 1;
268 e
< NB_UNPACK_TREES_WARNING_TYPES
; e
++) {
269 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
271 if (rejects
->nr
> 0) {
273 struct strbuf path
= STRBUF_INIT
;
275 warning_displayed
= 1;
276 for (i
= 0; i
< rejects
->nr
; i
++)
277 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
278 warning(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
279 strbuf_release(&path
);
281 string_list_clear(rejects
, 0);
283 if (warning_displayed
)
284 fprintf(stderr
, _("After fixing the above paths, you may want to run `git sparse-checkout reapply`.\n"));
286 static int check_submodule_move_head(const struct cache_entry
*ce
,
289 struct unpack_trees_options
*o
)
291 unsigned flags
= SUBMODULE_MOVE_HEAD_DRY_RUN
;
292 const struct submodule
*sub
= submodule_from_ce(ce
);
298 flags
|= SUBMODULE_MOVE_HEAD_FORCE
;
300 if (submodule_move_head(ce
->name
, old_id
, new_id
, flags
))
301 return add_rejected_path(o
, ERROR_WOULD_LOSE_SUBMODULE
, ce
->name
);
306 * Perform the loading of the repository's gitmodules file. This function is
307 * used by 'check_update()' to perform loading of the gitmodules file in two
308 * different situations:
309 * (1) before removing entries from the working tree if the gitmodules file has
310 * been marked for removal. This situation is specified by 'state' == NULL.
311 * (2) before checking out entries to the working tree if the gitmodules file
312 * has been marked for update. This situation is specified by 'state' != NULL.
314 static void load_gitmodules_file(struct index_state
*index
,
315 struct checkout
*state
)
317 int pos
= index_name_pos(index
, GITMODULES_FILE
, strlen(GITMODULES_FILE
));
320 struct cache_entry
*ce
= index
->cache
[pos
];
321 if (!state
&& ce
->ce_flags
& CE_WT_REMOVE
) {
322 repo_read_gitmodules(the_repository
, 0);
323 } else if (state
&& (ce
->ce_flags
& CE_UPDATE
)) {
324 submodule_free(the_repository
);
325 checkout_entry(ce
, state
, NULL
, NULL
);
326 repo_read_gitmodules(the_repository
, 0);
331 static struct progress
*get_progress(struct unpack_trees_options
*o
)
333 unsigned cnt
= 0, total
= 0;
334 struct index_state
*index
= &o
->result
;
336 if (!o
->update
|| !o
->verbose_update
)
339 for (; cnt
< index
->cache_nr
; cnt
++) {
340 const struct cache_entry
*ce
= index
->cache
[cnt
];
341 if (ce
->ce_flags
& (CE_UPDATE
| CE_WT_REMOVE
))
345 return start_delayed_progress(_("Updating files"), total
);
348 static void setup_collided_checkout_detection(struct checkout
*state
,
349 struct index_state
*index
)
354 for (i
= 0; i
< index
->cache_nr
; i
++)
355 index
->cache
[i
]->ce_flags
&= ~CE_MATCHED
;
358 static void report_collided_checkout(struct index_state
*index
)
360 struct string_list list
= STRING_LIST_INIT_NODUP
;
363 for (i
= 0; i
< index
->cache_nr
; i
++) {
364 struct cache_entry
*ce
= index
->cache
[i
];
366 if (!(ce
->ce_flags
& CE_MATCHED
))
369 string_list_append(&list
, ce
->name
);
370 ce
->ce_flags
&= ~CE_MATCHED
;
373 list
.cmp
= fspathcmp
;
374 string_list_sort(&list
);
377 warning(_("the following paths have collided (e.g. case-sensitive paths\n"
378 "on a case-insensitive filesystem) and only one from the same\n"
379 "colliding group is in the working tree:\n"));
381 for (i
= 0; i
< list
.nr
; i
++)
382 fprintf(stderr
, " '%s'\n", list
.items
[i
].string
);
385 string_list_clear(&list
, 0);
388 static int check_updates(struct unpack_trees_options
*o
,
389 struct index_state
*index
)
393 struct progress
*progress
;
394 struct checkout state
= CHECKOUT_INIT
;
397 trace_performance_enter();
400 state
.refresh_cache
= 1;
401 state
.istate
= index
;
403 if (!o
->update
|| o
->dry_run
) {
404 remove_marked_cache_entries(index
, 0);
405 trace_performance_leave("check_updates");
410 setup_collided_checkout_detection(&state
, index
);
412 progress
= get_progress(o
);
414 git_attr_set_direction(GIT_ATTR_CHECKOUT
);
416 if (should_update_submodules())
417 load_gitmodules_file(index
, NULL
);
419 for (i
= 0; i
< index
->cache_nr
; i
++) {
420 const struct cache_entry
*ce
= index
->cache
[i
];
422 if (ce
->ce_flags
& CE_WT_REMOVE
) {
423 display_progress(progress
, ++cnt
);
428 remove_marked_cache_entries(index
, 0);
429 remove_scheduled_dirs();
431 if (should_update_submodules())
432 load_gitmodules_file(index
, &state
);
434 enable_delayed_checkout(&state
);
435 if (has_promisor_remote()) {
437 * Prefetch the objects that are to be checked out in the loop
440 struct oid_array to_fetch
= OID_ARRAY_INIT
;
441 for (i
= 0; i
< index
->cache_nr
; i
++) {
442 struct cache_entry
*ce
= index
->cache
[i
];
444 if (!(ce
->ce_flags
& CE_UPDATE
) ||
445 S_ISGITLINK(ce
->ce_mode
))
447 if (!oid_object_info_extended(the_repository
, &ce
->oid
,
449 OBJECT_INFO_FOR_PREFETCH
))
451 oid_array_append(&to_fetch
, &ce
->oid
);
454 promisor_remote_get_direct(the_repository
,
455 to_fetch
.oid
, to_fetch
.nr
);
456 oid_array_clear(&to_fetch
);
458 for (i
= 0; i
< index
->cache_nr
; i
++) {
459 struct cache_entry
*ce
= index
->cache
[i
];
461 if (ce
->ce_flags
& CE_UPDATE
) {
462 if (ce
->ce_flags
& CE_WT_REMOVE
)
463 BUG("both update and delete flags are set on %s",
465 display_progress(progress
, ++cnt
);
466 ce
->ce_flags
&= ~CE_UPDATE
;
467 errs
|= checkout_entry(ce
, &state
, NULL
, NULL
);
470 stop_progress(&progress
);
471 errs
|= finish_delayed_checkout(&state
, NULL
);
472 git_attr_set_direction(GIT_ATTR_CHECKIN
);
475 report_collided_checkout(index
);
477 trace_performance_leave("check_updates");
481 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
482 struct unpack_trees_options
*o
);
483 static int verify_absent_sparse(const struct cache_entry
*ce
,
484 enum unpack_trees_error_types
,
485 struct unpack_trees_options
*o
);
487 static int apply_sparse_checkout(struct index_state
*istate
,
488 struct cache_entry
*ce
,
489 struct unpack_trees_options
*o
)
491 int was_skip_worktree
= ce_skip_worktree(ce
);
493 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
494 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
496 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
497 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
498 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
499 mark_fsmonitor_invalid(istate
, ce
);
500 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
504 * if (!was_skip_worktree && !ce_skip_worktree()) {
505 * This is perfectly normal. Move on;
510 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
511 * area as a result of ce_skip_worktree() shortcuts in
512 * verify_absent() and verify_uptodate().
513 * Make sure they don't modify worktree if they are already
514 * outside checkout area
516 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
517 ce
->ce_flags
&= ~CE_UPDATE
;
520 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
521 * on to get that file removed from both index and worktree.
522 * If that file is already outside worktree area, don't
525 if (ce
->ce_flags
& CE_REMOVE
)
526 ce
->ce_flags
&= ~CE_WT_REMOVE
;
529 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
531 * If CE_UPDATE is set, verify_uptodate() must be called already
532 * also stat info may have lost after merged_entry() so calling
533 * verify_uptodate() again may fail
535 if (!(ce
->ce_flags
& CE_UPDATE
) &&
536 verify_uptodate_sparse(ce
, o
)) {
537 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
540 ce
->ce_flags
|= CE_WT_REMOVE
;
541 ce
->ce_flags
&= ~CE_UPDATE
;
543 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
544 if (verify_absent_sparse(ce
, WARNING_SPARSE_ORPHANED_NOT_OVERWRITTEN
, o
))
546 ce
->ce_flags
|= CE_UPDATE
;
551 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
552 struct unpack_trees_options
*o
)
554 int ret
= o
->fn(src
, o
);
560 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
562 ce
->ce_flags
|= CE_UNPACKED
;
564 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
565 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
566 int bottom
= o
->cache_bottom
;
567 while (bottom
< o
->src_index
->cache_nr
&&
568 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
570 o
->cache_bottom
= bottom
;
574 static void mark_all_ce_unused(struct index_state
*index
)
577 for (i
= 0; i
< index
->cache_nr
; i
++)
578 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
581 static int locate_in_src_index(const struct cache_entry
*ce
,
582 struct unpack_trees_options
*o
)
584 struct index_state
*index
= o
->src_index
;
585 int len
= ce_namelen(ce
);
586 int pos
= index_name_pos(index
, ce
->name
, len
);
593 * We call unpack_index_entry() with an unmerged cache entry
594 * only in diff-index, and it wants a single callback. Skip
595 * the other unmerged entry with the same name.
597 static void mark_ce_used_same_name(struct cache_entry
*ce
,
598 struct unpack_trees_options
*o
)
600 struct index_state
*index
= o
->src_index
;
601 int len
= ce_namelen(ce
);
604 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
605 struct cache_entry
*next
= index
->cache
[pos
];
606 if (len
!= ce_namelen(next
) ||
607 memcmp(ce
->name
, next
->name
, len
))
609 mark_ce_used(next
, o
);
613 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
615 const struct index_state
*index
= o
->src_index
;
616 int pos
= o
->cache_bottom
;
618 while (pos
< index
->cache_nr
) {
619 struct cache_entry
*ce
= index
->cache
[pos
];
620 if (!(ce
->ce_flags
& CE_UNPACKED
))
627 static void add_same_unmerged(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
);
635 die("programming error in a caller of mark_ce_used_same_name");
636 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
637 struct cache_entry
*next
= index
->cache
[pos
];
638 if (len
!= ce_namelen(next
) ||
639 memcmp(ce
->name
, next
->name
, len
))
641 add_entry(o
, next
, 0, 0);
642 mark_ce_used(next
, o
);
646 static int unpack_index_entry(struct cache_entry
*ce
,
647 struct unpack_trees_options
*o
)
649 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
656 if (o
->skip_unmerged
) {
657 add_entry(o
, ce
, 0, 0);
661 ret
= call_unpack_fn(src
, o
);
663 mark_ce_used_same_name(ce
, o
);
667 static int find_cache_pos(struct traverse_info
*, const char *p
, size_t len
);
669 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
671 struct unpack_trees_options
*o
= info
->data
;
673 if (o
->diff_index_cached
)
675 o
->cache_bottom
= bottom
;
678 static int switch_cache_bottom(struct traverse_info
*info
)
680 struct unpack_trees_options
*o
= info
->data
;
683 if (o
->diff_index_cached
)
685 ret
= o
->cache_bottom
;
686 pos
= find_cache_pos(info
->prev
, info
->name
, info
->namelen
);
689 o
->cache_bottom
= -2 - pos
;
691 o
->cache_bottom
= o
->src_index
->cache_nr
;
695 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
697 return !is_null_oid(&name_j
->oid
) && !is_null_oid(&name_k
->oid
) && oideq(&name_j
->oid
, &name_k
->oid
);
700 static int all_trees_same_as_cache_tree(int n
, unsigned long dirmask
,
701 struct name_entry
*names
,
702 struct traverse_info
*info
)
704 struct unpack_trees_options
*o
= info
->data
;
707 if (!o
->merge
|| dirmask
!= ((1 << n
) - 1))
710 for (i
= 1; i
< n
; i
++)
711 if (!are_same_oid(names
, names
+ i
))
714 return cache_tree_matches_traversal(o
->src_index
->cache_tree
, names
, info
);
717 static int index_pos_by_traverse_info(struct name_entry
*names
,
718 struct traverse_info
*info
)
720 struct unpack_trees_options
*o
= info
->data
;
721 struct strbuf name
= STRBUF_INIT
;
724 strbuf_make_traverse_path(&name
, info
, names
->path
, names
->pathlen
);
725 strbuf_addch(&name
, '/');
726 pos
= index_name_pos(o
->src_index
, name
.buf
, name
.len
);
728 BUG("This is a directory and should not exist in index");
730 if (pos
>= o
->src_index
->cache_nr
||
731 !starts_with(o
->src_index
->cache
[pos
]->name
, name
.buf
) ||
732 (pos
> 0 && starts_with(o
->src_index
->cache
[pos
-1]->name
, name
.buf
)))
733 BUG("pos %d doesn't point to the first entry of %s in index",
735 strbuf_release(&name
);
740 * Fast path if we detect that all trees are the same as cache-tree at this
741 * path. We'll walk these trees in an iterative loop using cache-tree/index
742 * instead of ODB since we already know what these trees contain.
744 static int traverse_by_cache_tree(int pos
, int nr_entries
, int nr_names
,
745 struct traverse_info
*info
)
747 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
748 struct unpack_trees_options
*o
= info
->data
;
749 struct cache_entry
*tree_ce
= NULL
;
754 BUG("We need cache-tree to do this optimization");
757 * Do what unpack_callback() and unpack_nondirectories() normally
758 * do. But we walk all paths in an iterative loop instead.
760 * D/F conflicts and higher stage entries are not a concern
761 * because cache-tree would be invalidated and we would never
762 * get here in the first place.
764 for (i
= 0; i
< nr_entries
; i
++) {
765 int new_ce_len
, len
, rc
;
767 src
[0] = o
->src_index
->cache
[pos
+ i
];
769 len
= ce_namelen(src
[0]);
770 new_ce_len
= cache_entry_size(len
);
772 if (new_ce_len
> ce_len
) {
774 tree_ce
= xrealloc(tree_ce
, new_ce_len
);
775 memset(tree_ce
, 0, new_ce_len
);
778 tree_ce
->ce_flags
= create_ce_flags(0);
780 for (d
= 1; d
<= nr_names
; d
++)
784 tree_ce
->ce_mode
= src
[0]->ce_mode
;
785 tree_ce
->ce_namelen
= len
;
786 oidcpy(&tree_ce
->oid
, &src
[0]->oid
);
787 memcpy(tree_ce
->name
, src
[0]->name
, len
+ 1);
789 rc
= call_unpack_fn((const struct cache_entry
* const *)src
, o
);
795 mark_ce_used(src
[0], o
);
799 printf("Unpacked %d entries from %s to %s using cache-tree\n",
801 o
->src_index
->cache
[pos
]->name
,
802 o
->src_index
->cache
[pos
+ nr_entries
- 1]->name
);
806 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
807 unsigned long df_conflicts
,
808 struct name_entry
*names
,
809 struct traverse_info
*info
)
811 struct unpack_trees_options
*o
= info
->data
;
814 struct tree_desc t
[MAX_UNPACK_TREES
];
815 void *buf
[MAX_UNPACK_TREES
];
816 struct traverse_info newinfo
;
817 struct name_entry
*p
;
820 nr_entries
= all_trees_same_as_cache_tree(n
, dirmask
, names
, info
);
821 if (nr_entries
> 0) {
822 int pos
= index_pos_by_traverse_info(names
, info
);
824 if (!o
->merge
|| df_conflicts
)
825 BUG("Wrong condition to get here buddy");
828 * All entries up to 'pos' must have been processed
829 * (i.e. marked CE_UNPACKED) at this point. But to be safe,
830 * save and restore cache_bottom anyway to not miss
831 * unprocessed entries before 'pos'.
833 bottom
= o
->cache_bottom
;
834 ret
= traverse_by_cache_tree(pos
, nr_entries
, n
, info
);
835 o
->cache_bottom
= bottom
;
845 newinfo
.pathspec
= info
->pathspec
;
846 newinfo
.name
= p
->path
;
847 newinfo
.namelen
= p
->pathlen
;
848 newinfo
.mode
= p
->mode
;
849 newinfo
.pathlen
= st_add3(newinfo
.pathlen
, tree_entry_len(p
), 1);
850 newinfo
.df_conflicts
|= df_conflicts
;
853 * Fetch the tree from the ODB for each peer directory in the
856 * For 2- and 3-way traversals, we try to avoid hitting the
857 * ODB twice for the same OID. This should yield a nice speed
858 * up in checkouts and merges when the commits are similar.
860 * We don't bother doing the full O(n^2) search for larger n,
861 * because wider traversals don't happen that often and we
862 * avoid the search setup.
864 * When 2 peer OIDs are the same, we just copy the tree
865 * descriptor data. This implicitly borrows the buffer
866 * data from the earlier cell.
868 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
869 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
871 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
874 const struct object_id
*oid
= NULL
;
877 buf
[nr_buf
++] = fill_tree_descriptor(the_repository
, t
+ i
, oid
);
881 bottom
= switch_cache_bottom(&newinfo
);
882 ret
= traverse_trees(o
->src_index
, n
, t
, &newinfo
);
883 restore_cache_bottom(&newinfo
, bottom
);
885 for (i
= 0; i
< nr_buf
; i
++)
892 * Compare the traverse-path to the cache entry without actually
893 * having to generate the textual representation of the traverse
896 * NOTE! This *only* compares up to the size of the traverse path
897 * itself - the caller needs to do the final check for the cache
898 * entry having more data at the end!
900 static int do_compare_entry_piecewise(const struct cache_entry
*ce
,
901 const struct traverse_info
*info
,
902 const char *name
, size_t namelen
,
909 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
910 info
->name
, info
->namelen
,
915 pathlen
= info
->pathlen
;
916 ce_len
= ce_namelen(ce
);
918 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
919 if (ce_len
< pathlen
)
923 ce_name
= ce
->name
+ pathlen
;
925 return df_name_compare(ce_name
, ce_len
, S_IFREG
, name
, namelen
, mode
);
928 static int do_compare_entry(const struct cache_entry
*ce
,
929 const struct traverse_info
*info
,
930 const char *name
, size_t namelen
,
938 * If we have not precomputed the traverse path, it is quicker
939 * to avoid doing so. But if we have precomputed it,
940 * it is quicker to use the precomputed version.
942 if (!info
->traverse_path
)
943 return do_compare_entry_piecewise(ce
, info
, name
, namelen
, mode
);
945 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
949 pathlen
= info
->pathlen
;
950 ce_len
= ce_namelen(ce
);
952 if (ce_len
< pathlen
)
956 ce_name
= ce
->name
+ pathlen
;
958 return df_name_compare(ce_name
, ce_len
, S_IFREG
, name
, namelen
, mode
);
961 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
963 int cmp
= do_compare_entry(ce
, info
, n
->path
, n
->pathlen
, n
->mode
);
968 * Even if the beginning compared identically, the ce should
969 * compare as bigger than a directory leading up to it!
971 return ce_namelen(ce
) > traverse_path_len(info
, tree_entry_len(n
));
974 static int ce_in_traverse_path(const struct cache_entry
*ce
,
975 const struct traverse_info
*info
)
979 if (do_compare_entry(ce
, info
->prev
,
980 info
->name
, info
->namelen
, info
->mode
))
983 * If ce (blob) is the same name as the path (which is a tree
984 * we will be descending into), it won't be inside it.
986 return (info
->pathlen
< ce_namelen(ce
));
989 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
,
990 const struct name_entry
*n
,
992 struct index_state
*istate
,
995 size_t len
= traverse_path_len(info
, tree_entry_len(n
));
996 struct cache_entry
*ce
=
998 make_empty_transient_cache_entry(len
) :
999 make_empty_cache_entry(istate
, len
);
1001 ce
->ce_mode
= create_ce_mode(n
->mode
);
1002 ce
->ce_flags
= create_ce_flags(stage
);
1003 ce
->ce_namelen
= len
;
1004 oidcpy(&ce
->oid
, &n
->oid
);
1005 /* len+1 because the cache_entry allocates space for NUL */
1006 make_traverse_path(ce
->name
, len
+ 1, info
, n
->path
, n
->pathlen
);
1012 * Note that traverse_by_cache_tree() duplicates some logic in this function
1013 * without actually calling it. If you change the logic here you may need to
1014 * check and change there as well.
1016 static int unpack_nondirectories(int n
, unsigned long mask
,
1017 unsigned long dirmask
,
1018 struct cache_entry
**src
,
1019 const struct name_entry
*names
,
1020 const struct traverse_info
*info
)
1023 struct unpack_trees_options
*o
= info
->data
;
1024 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
1026 /* Do we have *only* directories? Nothing to do */
1027 if (mask
== dirmask
&& !src
[0])
1031 * Ok, we've filled in up to any potential index entry in src[0],
1034 for (i
= 0; i
< n
; i
++) {
1036 unsigned int bit
= 1ul << i
;
1037 if (conflicts
& bit
) {
1038 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
1045 else if (i
+ 1 < o
->head_idx
)
1047 else if (i
+ 1 > o
->head_idx
)
1053 * If the merge bit is set, then the cache entries are
1054 * discarded in the following block. In this case,
1055 * construct "transient" cache_entries, as they are
1056 * not stored in the index. otherwise construct the
1057 * cache entry from the index aware logic.
1059 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
, &o
->result
, o
->merge
);
1063 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
1065 for (i
= 0; i
< n
; i
++) {
1066 struct cache_entry
*ce
= src
[i
+ o
->merge
];
1067 if (ce
!= o
->df_conflict_entry
)
1068 discard_cache_entry(ce
);
1073 for (i
= 0; i
< n
; i
++)
1074 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
1075 if (do_add_entry(o
, src
[i
], 0, 0))
1081 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
1083 discard_index(&o
->result
);
1084 if (!o
->quiet
&& !o
->exiting_early
) {
1086 return error("%s", message
);
1093 * The tree traversal is looking at name p. If we have a matching entry,
1094 * return it. If name p is a directory in the index, do not return
1095 * anything, as we will want to match it when the traversal descends into
1098 static int find_cache_pos(struct traverse_info
*info
,
1099 const char *p
, size_t p_len
)
1102 struct unpack_trees_options
*o
= info
->data
;
1103 struct index_state
*index
= o
->src_index
;
1104 int pfxlen
= info
->pathlen
;
1106 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
1107 const struct cache_entry
*ce
= index
->cache
[pos
];
1108 const char *ce_name
, *ce_slash
;
1111 if (ce
->ce_flags
& CE_UNPACKED
) {
1113 * cache_bottom entry is already unpacked, so
1114 * we can never match it; don't check it
1117 if (pos
== o
->cache_bottom
)
1121 if (!ce_in_traverse_path(ce
, info
)) {
1123 * Check if we can skip future cache checks
1124 * (because we're already past all possible
1125 * entries in the traverse path).
1127 if (info
->traverse_path
) {
1128 if (strncmp(ce
->name
, info
->traverse_path
,
1134 ce_name
= ce
->name
+ pfxlen
;
1135 ce_slash
= strchr(ce_name
, '/');
1137 ce_len
= ce_slash
- ce_name
;
1139 ce_len
= ce_namelen(ce
) - pfxlen
;
1140 cmp
= name_compare(p
, p_len
, ce_name
, ce_len
);
1142 * Exact match; if we have a directory we need to
1143 * delay returning it.
1146 return ce_slash
? -2 - pos
: pos
;
1148 continue; /* keep looking */
1150 * ce_name sorts after p->path; could it be that we
1151 * have files under p->path directory in the index?
1152 * E.g. ce_name == "t-i", and p->path == "t"; we may
1153 * have "t/a" in the index.
1155 if (p_len
< ce_len
&& !memcmp(ce_name
, p
, p_len
) &&
1156 ce_name
[p_len
] < '/')
1157 continue; /* keep looking */
1163 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
1164 const struct name_entry
*p
)
1166 int pos
= find_cache_pos(info
, p
->path
, p
->pathlen
);
1167 struct unpack_trees_options
*o
= info
->data
;
1170 return o
->src_index
->cache
[pos
];
1175 static void debug_path(struct traverse_info
*info
)
1178 debug_path(info
->prev
);
1179 if (*info
->prev
->name
)
1182 printf("%s", info
->name
);
1185 static void debug_name_entry(int i
, struct name_entry
*n
)
1187 printf("ent#%d %06o %s\n", i
,
1188 n
->path
? n
->mode
: 0,
1189 n
->path
? n
->path
: "(missing)");
1192 static void debug_unpack_callback(int n
,
1194 unsigned long dirmask
,
1195 struct name_entry
*names
,
1196 struct traverse_info
*info
)
1199 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
1203 for (i
= 0; i
< n
; i
++)
1204 debug_name_entry(i
, names
+ i
);
1208 * Note that traverse_by_cache_tree() duplicates some logic in this function
1209 * without actually calling it. If you change the logic here you may need to
1210 * check and change there as well.
1212 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
1214 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
1215 struct unpack_trees_options
*o
= info
->data
;
1216 const struct name_entry
*p
= names
;
1218 /* Find first entry with a real name (we could use "mask" too) */
1222 if (o
->debug_unpack
)
1223 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
1225 /* Are we supposed to look at the index too? */
1229 struct cache_entry
*ce
;
1231 if (o
->diff_index_cached
)
1232 ce
= next_cache_entry(o
);
1234 ce
= find_cache_entry(info
, p
);
1238 cmp
= compare_entry(ce
, info
, p
);
1240 if (unpack_index_entry(ce
, o
) < 0)
1241 return unpack_failed(o
, NULL
);
1247 * If we skip unmerged index
1248 * entries, we'll skip this
1249 * entry *and* the tree
1250 * entries associated with it!
1252 if (o
->skip_unmerged
) {
1253 add_same_unmerged(ce
, o
);
1263 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
1266 if (o
->merge
&& src
[0]) {
1267 if (ce_stage(src
[0]))
1268 mark_ce_used_same_name(src
[0], o
);
1270 mark_ce_used(src
[0], o
);
1273 /* Now handle any directories.. */
1275 /* special case: "diff-index --cached" looking at a tree */
1276 if (o
->diff_index_cached
&&
1277 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1279 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1282 * Everything under the name matches; skip the
1283 * entire hierarchy. diff_index_cached codepath
1284 * special cases D/F conflicts in such a way that
1285 * it does not do any look-ahead, so this is safe.
1288 o
->cache_bottom
+= matches
;
1293 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1302 static int clear_ce_flags_1(struct index_state
*istate
,
1303 struct cache_entry
**cache
, int nr
,
1304 struct strbuf
*prefix
,
1305 int select_mask
, int clear_mask
,
1306 struct pattern_list
*pl
,
1307 enum pattern_match_result default_match
,
1310 /* Whole directory matching */
1311 static int clear_ce_flags_dir(struct index_state
*istate
,
1312 struct cache_entry
**cache
, int nr
,
1313 struct strbuf
*prefix
,
1315 int select_mask
, int clear_mask
,
1316 struct pattern_list
*pl
,
1317 enum pattern_match_result default_match
,
1320 struct cache_entry
**cache_end
;
1323 enum pattern_match_result ret
, orig_ret
;
1324 orig_ret
= path_matches_pattern_list(prefix
->buf
, prefix
->len
,
1325 basename
, &dtype
, pl
, istate
);
1327 strbuf_addch(prefix
, '/');
1329 /* If undecided, use matching result of parent dir in defval */
1330 if (orig_ret
== UNDECIDED
)
1331 ret
= default_match
;
1335 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1336 struct cache_entry
*ce
= *cache_end
;
1337 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1341 if (pl
->use_cone_patterns
&& orig_ret
== MATCHED_RECURSIVE
) {
1342 struct cache_entry
**ce
= cache
;
1343 rc
= cache_end
- cache
;
1345 while (ce
< cache_end
) {
1346 (*ce
)->ce_flags
&= ~clear_mask
;
1349 } else if (pl
->use_cone_patterns
&& orig_ret
== NOT_MATCHED
) {
1350 rc
= cache_end
- cache
;
1352 rc
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1354 select_mask
, clear_mask
,
1359 strbuf_setlen(prefix
, prefix
->len
- 1);
1364 * Traverse the index, find every entry that matches according to
1365 * o->pl. Do "ce_flags &= ~clear_mask" on those entries. Return the
1366 * number of traversed entries.
1368 * If select_mask is non-zero, only entries whose ce_flags has on of
1369 * those bits enabled are traversed.
1371 * cache : pointer to an index entry
1372 * prefix_len : an offset to its path
1374 * The current path ("prefix") including the trailing '/' is
1375 * cache[0]->name[0..(prefix_len-1)]
1376 * Top level path has prefix_len zero.
1378 static int clear_ce_flags_1(struct index_state
*istate
,
1379 struct cache_entry
**cache
, int nr
,
1380 struct strbuf
*prefix
,
1381 int select_mask
, int clear_mask
,
1382 struct pattern_list
*pl
,
1383 enum pattern_match_result default_match
,
1386 struct cache_entry
**cache_end
= nr
? cache
+ nr
: cache
;
1389 * Process all entries that have the given prefix and meet
1390 * select_mask condition
1392 while(cache
!= cache_end
) {
1393 struct cache_entry
*ce
= *cache
;
1394 const char *name
, *slash
;
1396 enum pattern_match_result ret
;
1398 display_progress(istate
->progress
, progress_nr
);
1400 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1406 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1409 name
= ce
->name
+ prefix
->len
;
1410 slash
= strchr(name
, '/');
1412 /* If it's a directory, try whole directory match first */
1417 strbuf_add(prefix
, name
, len
);
1419 processed
= clear_ce_flags_dir(istate
, cache
, cache_end
- cache
,
1421 prefix
->buf
+ prefix
->len
- len
,
1422 select_mask
, clear_mask
,
1426 /* clear_c_f_dir eats a whole dir already? */
1429 progress_nr
+= processed
;
1430 strbuf_setlen(prefix
, prefix
->len
- len
);
1434 strbuf_addch(prefix
, '/');
1435 processed
= clear_ce_flags_1(istate
, cache
, cache_end
- cache
,
1437 select_mask
, clear_mask
, pl
,
1438 default_match
, progress_nr
);
1441 progress_nr
+= processed
;
1443 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1448 dtype
= ce_to_dtype(ce
);
1449 ret
= path_matches_pattern_list(ce
->name
,
1451 name
, &dtype
, pl
, istate
);
1452 if (ret
== UNDECIDED
)
1453 ret
= default_match
;
1454 if (ret
== MATCHED
|| ret
== MATCHED_RECURSIVE
)
1455 ce
->ce_flags
&= ~clear_mask
;
1460 display_progress(istate
->progress
, progress_nr
);
1461 return nr
- (cache_end
- cache
);
1464 static int clear_ce_flags(struct index_state
*istate
,
1465 int select_mask
, int clear_mask
,
1466 struct pattern_list
*pl
,
1469 static struct strbuf prefix
= STRBUF_INIT
;
1473 strbuf_reset(&prefix
);
1475 istate
->progress
= start_delayed_progress(
1476 _("Updating index flags"),
1479 xsnprintf(label
, sizeof(label
), "clear_ce_flags(0x%08lx,0x%08lx)",
1480 (unsigned long)select_mask
, (unsigned long)clear_mask
);
1481 trace2_region_enter("unpack_trees", label
, the_repository
);
1482 rval
= clear_ce_flags_1(istate
,
1486 select_mask
, clear_mask
,
1488 trace2_region_leave("unpack_trees", label
, the_repository
);
1490 stop_progress(&istate
->progress
);
1495 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1497 static void mark_new_skip_worktree(struct pattern_list
*pl
,
1498 struct index_state
*istate
,
1499 int select_flag
, int skip_wt_flag
,
1505 * 1. Pretend the narrowest worktree: only unmerged entries
1508 for (i
= 0; i
< istate
->cache_nr
; i
++) {
1509 struct cache_entry
*ce
= istate
->cache
[i
];
1511 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1514 if (!ce_stage(ce
) && !(ce
->ce_flags
& CE_CONFLICTED
))
1515 ce
->ce_flags
|= skip_wt_flag
;
1517 ce
->ce_flags
&= ~skip_wt_flag
;
1521 * 2. Widen worktree according to sparse-checkout file.
1522 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1524 clear_ce_flags(istate
, select_flag
, skip_wt_flag
, pl
, show_progress
);
1527 static void populate_from_existing_patterns(struct unpack_trees_options
*o
,
1528 struct pattern_list
*pl
)
1530 char *sparse
= git_pathdup("info/sparse-checkout");
1532 pl
->use_cone_patterns
= core_sparse_checkout_cone
;
1533 if (add_patterns_from_file_to_list(sparse
, "", 0, pl
, NULL
) < 0)
1534 o
->skip_sparse_checkout
= 1;
1541 static int verify_absent(const struct cache_entry
*,
1542 enum unpack_trees_error_types
,
1543 struct unpack_trees_options
*);
1545 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1546 * resulting index, -2 on failure to reflect the changes to the work tree.
1548 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1550 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1553 static struct cache_entry
*dfc
;
1554 struct pattern_list pl
;
1555 int free_pattern_list
= 0;
1557 if (len
> MAX_UNPACK_TREES
)
1558 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1560 trace_performance_enter();
1561 if (!core_apply_sparse_checkout
|| !o
->update
)
1562 o
->skip_sparse_checkout
= 1;
1563 if (!o
->skip_sparse_checkout
&& !o
->pl
) {
1564 memset(&pl
, 0, sizeof(pl
));
1565 free_pattern_list
= 1;
1566 populate_from_existing_patterns(o
, &pl
);
1569 memset(&o
->result
, 0, sizeof(o
->result
));
1570 o
->result
.initialized
= 1;
1571 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1572 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1573 o
->result
.version
= o
->src_index
->version
;
1574 if (!o
->src_index
->split_index
) {
1575 o
->result
.split_index
= NULL
;
1576 } else if (o
->src_index
== o
->dst_index
) {
1578 * o->dst_index (and thus o->src_index) will be discarded
1579 * and overwritten with o->result at the end of this function,
1580 * so just use src_index's split_index to avoid having to
1583 o
->result
.split_index
= o
->src_index
->split_index
;
1584 o
->result
.split_index
->refcount
++;
1586 o
->result
.split_index
= init_split_index(&o
->result
);
1588 oidcpy(&o
->result
.oid
, &o
->src_index
->oid
);
1589 o
->merge_size
= len
;
1590 mark_all_ce_unused(o
->src_index
);
1592 if (o
->src_index
->fsmonitor_last_update
)
1593 o
->result
.fsmonitor_last_update
= o
->src_index
->fsmonitor_last_update
;
1596 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1598 if (!o
->skip_sparse_checkout
)
1599 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1600 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1603 dfc
= xcalloc(1, cache_entry_size(0));
1604 o
->df_conflict_entry
= dfc
;
1607 const char *prefix
= o
->prefix
? o
->prefix
: "";
1608 struct traverse_info info
;
1610 setup_traverse_info(&info
, prefix
);
1611 info
.fn
= unpack_callback
;
1613 info
.show_all_errors
= o
->show_all_errors
;
1614 info
.pathspec
= o
->pathspec
;
1618 * Unpack existing index entries that sort before the
1619 * prefix the tree is spliced into. Note that o->merge
1620 * is always true in this case.
1623 struct cache_entry
*ce
= next_cache_entry(o
);
1626 if (ce_in_traverse_path(ce
, &info
))
1628 if (unpack_index_entry(ce
, o
) < 0)
1633 trace_performance_enter();
1634 ret
= traverse_trees(o
->src_index
, len
, t
, &info
);
1635 trace_performance_leave("traverse_trees");
1640 /* Any left-over entries in the index? */
1643 struct cache_entry
*ce
= next_cache_entry(o
);
1646 if (unpack_index_entry(ce
, o
) < 0)
1650 mark_all_ce_unused(o
->src_index
);
1652 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1653 ret
= unpack_failed(o
, "Merge requires file-level merging");
1657 if (!o
->skip_sparse_checkout
) {
1658 int empty_worktree
= 1;
1661 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1662 * If they will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1663 * so apply_sparse_checkout() won't attempt to remove it from worktree
1665 mark_new_skip_worktree(o
->pl
, &o
->result
,
1666 CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
,
1670 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1671 struct cache_entry
*ce
= o
->result
.cache
[i
];
1674 * Entries marked with CE_ADDED in merged_entry() do not have
1675 * verify_absent() check (the check is effectively disabled
1676 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1678 * Do the real check now because we have had
1679 * correct CE_NEW_SKIP_WORKTREE
1681 if (ce
->ce_flags
& CE_ADDED
&&
1682 verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1683 if (!o
->show_all_errors
)
1688 if (apply_sparse_checkout(&o
->result
, ce
, o
)) {
1689 if (!o
->show_all_errors
)
1693 if (!ce_skip_worktree(ce
))
1700 * Sparse checkout is meant to narrow down checkout area
1701 * but it does not make sense to narrow down to empty working
1702 * tree. This is usually a mistake in sparse checkout rules.
1703 * Do not allow users to do that.
1705 if (o
->result
.cache_nr
&& empty_worktree
) {
1706 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1711 ret
= check_updates(o
, &o
->result
) ? (-2) : 0;
1713 move_index_extensions(&o
->result
, o
->src_index
);
1715 if (git_env_bool("GIT_TEST_CHECK_CACHE_TREE", 0))
1716 cache_tree_verify(the_repository
, &o
->result
);
1717 if (!o
->result
.cache_tree
)
1718 o
->result
.cache_tree
= cache_tree();
1719 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1720 cache_tree_update(&o
->result
,
1725 o
->result
.updated_workdir
= 1;
1726 discard_index(o
->dst_index
);
1727 *o
->dst_index
= o
->result
;
1729 discard_index(&o
->result
);
1731 o
->src_index
= NULL
;
1734 if (free_pattern_list
)
1735 clear_pattern_list(&pl
);
1736 trace_performance_leave("unpack_trees");
1740 if (o
->show_all_errors
) {
1741 display_error_msgs(o
);
1742 display_warning_msgs(o
);
1744 mark_all_ce_unused(o
->src_index
);
1745 ret
= unpack_failed(o
, NULL
);
1746 if (o
->exiting_early
)
1752 * Update SKIP_WORKTREE bits according to sparsity patterns, and update
1753 * working directory to match.
1755 * CE_NEW_SKIP_WORKTREE is used internally.
1757 enum update_sparsity_result
update_sparsity(struct unpack_trees_options
*o
)
1759 enum update_sparsity_result ret
= UPDATE_SPARSITY_SUCCESS
;
1760 struct pattern_list pl
;
1761 int i
, empty_worktree
;
1762 unsigned old_show_all_errors
;
1763 int free_pattern_list
= 0;
1765 old_show_all_errors
= o
->show_all_errors
;
1766 o
->show_all_errors
= 1;
1769 if (!o
->update
|| o
->index_only
|| o
->skip_sparse_checkout
)
1770 BUG("update_sparsity() is for reflecting sparsity patterns in working directory");
1771 if (o
->src_index
!= o
->dst_index
|| o
->fn
)
1772 BUG("update_sparsity() called wrong");
1774 trace_performance_enter();
1776 /* If we weren't given patterns, use the recorded ones */
1778 memset(&pl
, 0, sizeof(pl
));
1779 free_pattern_list
= 1;
1780 populate_from_existing_patterns(o
, &pl
);
1781 if (o
->skip_sparse_checkout
)
1782 goto skip_sparse_checkout
;
1785 /* Set NEW_SKIP_WORKTREE on existing entries. */
1786 mark_all_ce_unused(o
->src_index
);
1787 mark_new_skip_worktree(o
->pl
, o
->src_index
, 0,
1788 CE_NEW_SKIP_WORKTREE
, o
->verbose_update
);
1790 /* Then loop over entries and update/remove as needed */
1791 ret
= UPDATE_SPARSITY_SUCCESS
;
1793 for (i
= 0; i
< o
->src_index
->cache_nr
; i
++) {
1794 struct cache_entry
*ce
= o
->src_index
->cache
[i
];
1796 if (apply_sparse_checkout(o
->src_index
, ce
, o
))
1797 ret
= UPDATE_SPARSITY_WARNINGS
;
1799 if (!ce_skip_worktree(ce
))
1804 * Sparse checkout is meant to narrow down checkout area
1805 * but it does not make sense to narrow down to empty working
1806 * tree. This is usually a mistake in sparse checkout rules.
1807 * Do not allow users to do that.
1809 if (o
->src_index
->cache_nr
&& empty_worktree
) {
1810 unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1811 ret
= UPDATE_SPARSITY_INDEX_UPDATE_FAILURES
;
1815 skip_sparse_checkout
:
1816 if (check_updates(o
, o
->src_index
))
1817 ret
= UPDATE_SPARSITY_WORKTREE_UPDATE_FAILURES
;
1820 display_warning_msgs(o
);
1821 o
->show_all_errors
= old_show_all_errors
;
1822 if (free_pattern_list
)
1823 clear_pattern_list(&pl
);
1824 trace_performance_leave("update_sparsity");
1828 /* Here come the merge functions */
1830 static int reject_merge(const struct cache_entry
*ce
,
1831 struct unpack_trees_options
*o
)
1833 return add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1836 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1842 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1844 return a
->ce_mode
== b
->ce_mode
&&
1845 oideq(&a
->oid
, &b
->oid
);
1850 * When a CE gets turned into an unmerged entry, we
1851 * want it to be up-to-date
1853 static int verify_uptodate_1(const struct cache_entry
*ce
,
1854 struct unpack_trees_options
*o
,
1855 enum unpack_trees_error_types error_type
)
1863 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1864 * if this entry is truly up-to-date because this file may be
1867 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1868 ; /* keep checking */
1869 else if (o
->reset
|| ce_uptodate(ce
))
1872 if (!lstat(ce
->name
, &st
)) {
1873 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1874 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1876 if (submodule_from_ce(ce
)) {
1877 int r
= check_submodule_move_head(ce
,
1878 "HEAD", oid_to_hex(&ce
->oid
), o
);
1880 return add_rejected_path(o
, error_type
, ce
->name
);
1887 * Historic default policy was to allow submodule to be out
1888 * of sync wrt the superproject index. If the submodule was
1889 * not considered interesting above, we don't care here.
1891 if (S_ISGITLINK(ce
->ce_mode
))
1896 if (errno
== ENOENT
)
1898 return add_rejected_path(o
, error_type
, ce
->name
);
1901 int verify_uptodate(const struct cache_entry
*ce
,
1902 struct unpack_trees_options
*o
)
1904 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1906 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1909 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1910 struct unpack_trees_options
*o
)
1912 return verify_uptodate_1(ce
, o
, WARNING_SPARSE_NOT_UPTODATE_FILE
);
1916 * TODO: We should actually invalidate o->result, not src_index [1].
1917 * But since cache tree and untracked cache both are not copied to
1918 * o->result until unpacking is complete, we invalidate them on
1919 * src_index instead with the assumption that they will be copied to
1920 * dst_index at the end.
1922 * [1] src_index->cache_tree is also used in unpack_callback() so if
1923 * we invalidate o->result, we need to update it to use
1924 * o->result.cache_tree as well.
1926 static void invalidate_ce_path(const struct cache_entry
*ce
,
1927 struct unpack_trees_options
*o
)
1931 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1932 untracked_cache_invalidate_path(o
->src_index
, ce
->name
, 1);
1936 * Check that checking out ce->sha1 in subdir ce->name is not
1937 * going to overwrite any working files.
1939 * Currently, git does not checkout subprojects during a superproject
1940 * checkout, so it is not going to overwrite anything.
1942 static int verify_clean_submodule(const char *old_sha1
,
1943 const struct cache_entry
*ce
,
1944 struct unpack_trees_options
*o
)
1946 if (!submodule_from_ce(ce
))
1949 return check_submodule_move_head(ce
, old_sha1
,
1950 oid_to_hex(&ce
->oid
), o
);
1953 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1954 struct unpack_trees_options
*o
)
1957 * we are about to extract "ce->name"; we would not want to lose
1958 * anything in the existing directory there.
1962 struct dir_struct d
;
1966 if (S_ISGITLINK(ce
->ce_mode
)) {
1967 struct object_id oid
;
1968 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", &oid
);
1970 * If we are not going to update the submodule, then
1973 if (!sub_head
&& oideq(&oid
, &ce
->oid
))
1975 return verify_clean_submodule(sub_head
? NULL
: oid_to_hex(&oid
),
1980 * First let's make sure we do not have a local modification
1981 * in that directory.
1983 namelen
= ce_namelen(ce
);
1984 for (i
= locate_in_src_index(ce
, o
);
1985 i
< o
->src_index
->cache_nr
;
1987 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1988 int len
= ce_namelen(ce2
);
1989 if (len
< namelen
||
1990 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1991 ce2
->name
[namelen
] != '/')
1994 * ce2->name is an entry in the subdirectory to be
1997 if (!ce_stage(ce2
)) {
1998 if (verify_uptodate(ce2
, o
))
2000 add_entry(o
, ce2
, CE_REMOVE
, 0);
2001 invalidate_ce_path(ce
, o
);
2002 mark_ce_used(ce2
, o
);
2008 * Then we need to make sure that we do not lose a locally
2009 * present file that is not ignored.
2011 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
2013 memset(&d
, 0, sizeof(d
));
2015 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
2016 i
= read_directory(&d
, o
->src_index
, pathbuf
, namelen
+1, NULL
);
2018 return add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
2024 * This gets called when there was no index entry for the tree entry 'dst',
2025 * but we found a file in the working tree that 'lstat()' said was fine,
2026 * and we're on a case-insensitive filesystem.
2028 * See if we can find a case-insensitive match in the index that also
2029 * matches the stat information, and assume it's that other file!
2031 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
2033 const struct cache_entry
*src
;
2035 src
= index_file_exists(o
->src_index
, name
, len
, 1);
2036 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
2039 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
2040 const struct cache_entry
*ce
, struct stat
*st
,
2041 enum unpack_trees_error_types error_type
,
2042 struct unpack_trees_options
*o
)
2044 const struct cache_entry
*result
;
2047 * It may be that the 'lstat()' succeeded even though
2048 * target 'ce' was absent, because there is an old
2049 * entry that is different only in case..
2051 * Ignore that lstat() if it matches.
2053 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
2057 is_excluded(o
->dir
, o
->src_index
, name
, &dtype
))
2059 * ce->name is explicitly excluded, so it is Ok to
2063 if (S_ISDIR(st
->st_mode
)) {
2065 * We are checking out path "foo" and
2066 * found "foo/." in the working tree.
2067 * This is tricky -- if we have modified
2068 * files that are in "foo/" we would lose
2071 if (verify_clean_subdirectory(ce
, o
) < 0)
2077 * The previous round may already have decided to
2078 * delete this path, which is in a subdirectory that
2079 * is being replaced with a blob.
2081 result
= index_file_exists(&o
->result
, name
, len
, 0);
2083 if (result
->ce_flags
& CE_REMOVE
)
2087 return add_rejected_path(o
, error_type
, name
);
2091 * We do not want to remove or overwrite a working tree file that
2092 * is not tracked, unless it is ignored.
2094 static int verify_absent_1(const struct cache_entry
*ce
,
2095 enum unpack_trees_error_types error_type
,
2096 struct unpack_trees_options
*o
)
2101 if (o
->index_only
|| o
->reset
|| !o
->update
)
2104 len
= check_leading_path(ce
->name
, ce_namelen(ce
));
2111 path
= xmemdupz(ce
->name
, len
);
2112 if (lstat(path
, &st
))
2113 ret
= error_errno("cannot stat '%s'", path
);
2115 if (submodule_from_ce(ce
))
2116 ret
= check_submodule_move_head(ce
,
2117 oid_to_hex(&ce
->oid
),
2120 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
2121 &st
, error_type
, o
);
2125 } else if (lstat(ce
->name
, &st
)) {
2126 if (errno
!= ENOENT
)
2127 return error_errno("cannot stat '%s'", ce
->name
);
2130 if (submodule_from_ce(ce
))
2131 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
2134 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
2135 ce_to_dtype(ce
), ce
, &st
,
2140 static int verify_absent(const struct cache_entry
*ce
,
2141 enum unpack_trees_error_types error_type
,
2142 struct unpack_trees_options
*o
)
2144 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
2146 return verify_absent_1(ce
, error_type
, o
);
2149 static int verify_absent_sparse(const struct cache_entry
*ce
,
2150 enum unpack_trees_error_types error_type
,
2151 struct unpack_trees_options
*o
)
2153 return verify_absent_1(ce
, error_type
, o
);
2156 static int merged_entry(const struct cache_entry
*ce
,
2157 const struct cache_entry
*old
,
2158 struct unpack_trees_options
*o
)
2160 int update
= CE_UPDATE
;
2161 struct cache_entry
*merge
= dup_cache_entry(ce
, &o
->result
);
2165 * New index entries. In sparse checkout, the following
2166 * verify_absent() will be delayed until after
2167 * traverse_trees() finishes in unpack_trees(), then:
2169 * - CE_NEW_SKIP_WORKTREE will be computed correctly
2170 * - verify_absent() be called again, this time with
2171 * correct CE_NEW_SKIP_WORKTREE
2173 * verify_absent() call here does nothing in sparse
2174 * checkout (i.e. o->skip_sparse_checkout == 0)
2177 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
2179 if (verify_absent(merge
,
2180 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
2181 discard_cache_entry(merge
);
2184 invalidate_ce_path(merge
, o
);
2186 if (submodule_from_ce(ce
)) {
2187 int ret
= check_submodule_move_head(ce
, NULL
,
2188 oid_to_hex(&ce
->oid
),
2194 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
2196 * See if we can re-use the old CE directly?
2197 * That way we get the uptodate stat info.
2199 * This also removes the UPDATE flag on a match; otherwise
2200 * we will end up overwriting local changes in the work tree.
2202 if (same(old
, merge
)) {
2203 copy_cache_entry(merge
, old
);
2206 if (verify_uptodate(old
, o
)) {
2207 discard_cache_entry(merge
);
2210 /* Migrate old flags over */
2211 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
2212 invalidate_ce_path(old
, o
);
2215 if (submodule_from_ce(ce
)) {
2216 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
2217 oid_to_hex(&ce
->oid
),
2224 * Previously unmerged entry left as an existence
2225 * marker by read_index_unmerged();
2227 invalidate_ce_path(old
, o
);
2230 if (do_add_entry(o
, merge
, update
, CE_STAGEMASK
) < 0)
2235 static int deleted_entry(const struct cache_entry
*ce
,
2236 const struct cache_entry
*old
,
2237 struct unpack_trees_options
*o
)
2239 /* Did it exist in the index? */
2241 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2245 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
2247 add_entry(o
, ce
, CE_REMOVE
, 0);
2248 invalidate_ce_path(ce
, o
);
2252 static int keep_entry(const struct cache_entry
*ce
,
2253 struct unpack_trees_options
*o
)
2255 add_entry(o
, ce
, 0, 0);
2257 invalidate_ce_path(ce
, o
);
2262 static void show_stage_entry(FILE *o
,
2263 const char *label
, const struct cache_entry
*ce
)
2266 fprintf(o
, "%s (missing)\n", label
);
2268 fprintf(o
, "%s%06o %s %d\t%s\n",
2271 oid_to_hex(&ce
->oid
),
2277 int threeway_merge(const struct cache_entry
* const *stages
,
2278 struct unpack_trees_options
*o
)
2280 const struct cache_entry
*index
;
2281 const struct cache_entry
*head
;
2282 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
2285 int remote_match
= 0;
2287 int df_conflict_head
= 0;
2288 int df_conflict_remote
= 0;
2290 int any_anc_missing
= 0;
2291 int no_anc_exists
= 1;
2294 for (i
= 1; i
< o
->head_idx
; i
++) {
2295 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
2296 any_anc_missing
= 1;
2302 head
= stages
[o
->head_idx
];
2304 if (head
== o
->df_conflict_entry
) {
2305 df_conflict_head
= 1;
2309 if (remote
== o
->df_conflict_entry
) {
2310 df_conflict_remote
= 1;
2315 * First, if there's a #16 situation, note that to prevent #13
2318 if (!same(remote
, head
)) {
2319 for (i
= 1; i
< o
->head_idx
; i
++) {
2320 if (same(stages
[i
], head
)) {
2323 if (same(stages
[i
], remote
)) {
2330 * We start with cases where the index is allowed to match
2331 * something other than the head: #14(ALT) and #2ALT, where it
2332 * is permitted to match the result instead.
2334 /* #14, #14ALT, #2ALT */
2335 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
2336 if (index
&& !same(index
, remote
) && !same(index
, head
))
2337 return reject_merge(index
, o
);
2338 return merged_entry(remote
, index
, o
);
2341 * If we have an entry in the index cache, then we want to
2342 * make sure that it matches head.
2344 if (index
&& !same(index
, head
))
2345 return reject_merge(index
, o
);
2349 if (same(head
, remote
))
2350 return merged_entry(head
, index
, o
);
2352 if (!df_conflict_remote
&& remote_match
&& !head_match
)
2353 return merged_entry(head
, index
, o
);
2357 if (!head
&& !remote
&& any_anc_missing
)
2361 * Under the "aggressive" rule, we resolve mostly trivial
2362 * cases that we historically had git-merge-one-file resolve.
2364 if (o
->aggressive
) {
2365 int head_deleted
= !head
;
2366 int remote_deleted
= !remote
;
2367 const struct cache_entry
*ce
= NULL
;
2376 for (i
= 1; i
< o
->head_idx
; i
++) {
2377 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2386 * Deleted in one and unchanged in the other.
2388 if ((head_deleted
&& remote_deleted
) ||
2389 (head_deleted
&& remote
&& remote_match
) ||
2390 (remote_deleted
&& head
&& head_match
)) {
2392 return deleted_entry(index
, index
, o
);
2393 if (ce
&& !head_deleted
) {
2394 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2400 * Added in both, identically.
2402 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
2403 return merged_entry(head
, index
, o
);
2407 /* Below are "no merge" cases, which require that the index be
2408 * up-to-date to avoid the files getting overwritten with
2409 * conflict resolution files.
2412 if (verify_uptodate(index
, o
))
2416 o
->nontrivial_merge
= 1;
2418 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2420 if (!head_match
|| !remote_match
) {
2421 for (i
= 1; i
< o
->head_idx
; i
++) {
2422 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2423 keep_entry(stages
[i
], o
);
2431 fprintf(stderr
, "read-tree: warning #16 detected\n");
2432 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2433 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2436 if (head
) { count
+= keep_entry(head
, o
); }
2437 if (remote
) { count
+= keep_entry(remote
, o
); }
2444 * The rule is to "carry forward" what is in the index without losing
2445 * information across a "fast-forward", favoring a successful merge
2446 * over a merge failure when it makes sense. For details of the
2447 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2450 int twoway_merge(const struct cache_entry
* const *src
,
2451 struct unpack_trees_options
*o
)
2453 const struct cache_entry
*current
= src
[0];
2454 const struct cache_entry
*oldtree
= src
[1];
2455 const struct cache_entry
*newtree
= src
[2];
2457 if (o
->merge_size
!= 2)
2458 return error("Cannot do a twoway merge of %d trees",
2461 if (oldtree
== o
->df_conflict_entry
)
2463 if (newtree
== o
->df_conflict_entry
)
2467 if (current
->ce_flags
& CE_CONFLICTED
) {
2468 if (same(oldtree
, newtree
) || o
->reset
) {
2470 return deleted_entry(current
, current
, o
);
2472 return merged_entry(newtree
, current
, o
);
2474 return reject_merge(current
, o
);
2475 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2476 (!oldtree
&& newtree
&&
2477 same(current
, newtree
)) || /* 6 and 7 */
2478 (oldtree
&& newtree
&&
2479 same(oldtree
, newtree
)) || /* 14 and 15 */
2480 (oldtree
&& newtree
&&
2481 !same(oldtree
, newtree
) && /* 18 and 19 */
2482 same(current
, newtree
))) {
2483 return keep_entry(current
, o
);
2484 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2486 return deleted_entry(oldtree
, current
, o
);
2487 } else if (oldtree
&& newtree
&&
2488 same(current
, oldtree
) && !same(current
, newtree
)) {
2490 return merged_entry(newtree
, current
, o
);
2492 return reject_merge(current
, o
);
2495 if (oldtree
&& !o
->initial_checkout
) {
2497 * deletion of the path was staged;
2499 if (same(oldtree
, newtree
))
2501 return reject_merge(oldtree
, o
);
2503 return merged_entry(newtree
, current
, o
);
2505 return deleted_entry(oldtree
, current
, o
);
2511 * Keep the index entries at stage0, collapse stage1 but make sure
2512 * stage0 does not have anything there.
2514 int bind_merge(const struct cache_entry
* const *src
,
2515 struct unpack_trees_options
*o
)
2517 const struct cache_entry
*old
= src
[0];
2518 const struct cache_entry
*a
= src
[1];
2520 if (o
->merge_size
!= 1)
2521 return error("Cannot do a bind merge of %d trees",
2524 return o
->quiet
? -1 :
2525 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2526 super_prefixed(a
->name
),
2527 super_prefixed(old
->name
));
2529 return keep_entry(old
, o
);
2531 return merged_entry(a
, NULL
, o
);
2538 * - take the stat information from stage0, take the data from stage1
2540 int oneway_merge(const struct cache_entry
* const *src
,
2541 struct unpack_trees_options
*o
)
2543 const struct cache_entry
*old
= src
[0];
2544 const struct cache_entry
*a
= src
[1];
2546 if (o
->merge_size
!= 1)
2547 return error("Cannot do a oneway merge of %d trees",
2550 if (!a
|| a
== o
->df_conflict_entry
)
2551 return deleted_entry(old
, old
, o
);
2553 if (old
&& same(old
, a
)) {
2555 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
) &&
2556 !(old
->ce_flags
& CE_FSMONITOR_VALID
)) {
2558 if (lstat(old
->name
, &st
) ||
2559 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2560 update
|= CE_UPDATE
;
2562 if (o
->update
&& S_ISGITLINK(old
->ce_mode
) &&
2563 should_update_submodules() && !verify_uptodate(old
, o
))
2564 update
|= CE_UPDATE
;
2565 add_entry(o
, old
, update
, CE_STAGEMASK
);
2568 return merged_entry(a
, old
, o
);