1 #define NO_THE_INDEX_COMPATIBILITY_MACROS
3 #include "argv-array.h"
4 #include "repository.h"
9 #include "cache-tree.h"
10 #include "unpack-trees.h"
14 #include "split-index.h"
16 #include "submodule.h"
17 #include "submodule-config.h"
18 #include "fsmonitor.h"
19 #include "object-store.h"
20 #include "fetch-object.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_ERROR_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_SPARSE_NOT_UPTODATE_FILE */
49 "Entry '%s' not uptodate. Cannot update sparse checkout.",
51 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
52 "Working tree file '%s' would be overwritten by sparse checkout update.",
54 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
55 "Working tree file '%s' would be removed by sparse checkout update.",
57 /* ERROR_WOULD_LOSE_SUBMODULE */
58 "Submodule '%s' cannot checkout new HEAD.",
61 #define ERRORMSG(o,type) \
62 ( ((o) && (o)->msgs[(type)]) \
63 ? ((o)->msgs[(type)]) \
64 : (unpack_plumbing_errors[(type)]) )
66 static const char *super_prefixed(const char *path
)
69 * It is necessary and sufficient to have two static buffers
70 * here, as the return value of this function is fed to
71 * error() using the unpack_*_errors[] templates we see above.
73 static struct strbuf buf
[2] = {STRBUF_INIT
, STRBUF_INIT
};
74 static int super_prefix_len
= -1;
75 static unsigned idx
= ARRAY_SIZE(buf
) - 1;
77 if (super_prefix_len
< 0) {
78 const char *super_prefix
= get_super_prefix();
83 for (i
= 0; i
< ARRAY_SIZE(buf
); i
++)
84 strbuf_addstr(&buf
[i
], super_prefix
);
85 super_prefix_len
= buf
[0].len
;
89 if (!super_prefix_len
)
92 if (++idx
>= ARRAY_SIZE(buf
))
95 strbuf_setlen(&buf
[idx
], super_prefix_len
);
96 strbuf_addstr(&buf
[idx
], path
);
101 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
105 const char **msgs
= opts
->msgs
;
108 argv_array_init(&opts
->msgs_to_free
);
110 if (!strcmp(cmd
, "checkout"))
111 msg
= advice_commit_before_merge
112 ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
113 "Please commit your changes or stash them before you switch branches.")
114 : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
115 else if (!strcmp(cmd
, "merge"))
116 msg
= advice_commit_before_merge
117 ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
118 "Please commit your changes or stash them before you merge.")
119 : _("Your local changes to the following files would be overwritten by merge:\n%%s");
121 msg
= advice_commit_before_merge
122 ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
123 "Please commit your changes or stash them before you %s.")
124 : _("Your local changes to the following files would be overwritten by %s:\n%%s");
125 msgs
[ERROR_WOULD_OVERWRITE
] = msgs
[ERROR_NOT_UPTODATE_FILE
] =
126 argv_array_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
128 msgs
[ERROR_NOT_UPTODATE_DIR
] =
129 _("Updating the following directories would lose untracked files in them:\n%s");
131 if (!strcmp(cmd
, "checkout"))
132 msg
= advice_commit_before_merge
133 ? _("The following untracked working tree files would be removed by checkout:\n%%s"
134 "Please move or remove them before you switch branches.")
135 : _("The following untracked working tree files would be removed by checkout:\n%%s");
136 else if (!strcmp(cmd
, "merge"))
137 msg
= advice_commit_before_merge
138 ? _("The following untracked working tree files would be removed by merge:\n%%s"
139 "Please move or remove them before you merge.")
140 : _("The following untracked working tree files would be removed by merge:\n%%s");
142 msg
= advice_commit_before_merge
143 ? _("The following untracked working tree files would be removed by %s:\n%%s"
144 "Please move or remove them before you %s.")
145 : _("The following untracked working tree files would be removed by %s:\n%%s");
146 msgs
[ERROR_WOULD_LOSE_UNTRACKED_REMOVED
] =
147 argv_array_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
149 if (!strcmp(cmd
, "checkout"))
150 msg
= advice_commit_before_merge
151 ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
152 "Please move or remove them before you switch branches.")
153 : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
154 else if (!strcmp(cmd
, "merge"))
155 msg
= advice_commit_before_merge
156 ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
157 "Please move or remove them before you merge.")
158 : _("The following untracked working tree files would be overwritten by merge:\n%%s");
160 msg
= advice_commit_before_merge
161 ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
162 "Please move or remove them before you %s.")
163 : _("The following untracked working tree files would be overwritten by %s:\n%%s");
164 msgs
[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
] =
165 argv_array_pushf(&opts
->msgs_to_free
, msg
, cmd
, cmd
);
168 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
169 * cannot easily display it as a list.
171 msgs
[ERROR_BIND_OVERLAP
] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
173 msgs
[ERROR_SPARSE_NOT_UPTODATE_FILE
] =
174 _("Cannot update sparse checkout: the following entries are not up to date:\n%s");
175 msgs
[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
] =
176 _("The following working tree files would be overwritten by sparse checkout update:\n%s");
177 msgs
[ERROR_WOULD_LOSE_ORPHANED_REMOVED
] =
178 _("The following working tree files would be removed by sparse checkout update:\n%s");
179 msgs
[ERROR_WOULD_LOSE_SUBMODULE
] =
180 _("Cannot update submodule:\n%s");
182 opts
->show_all_errors
= 1;
183 /* rejected paths may not have a static buffer */
184 for (i
= 0; i
< ARRAY_SIZE(opts
->unpack_rejects
); i
++)
185 opts
->unpack_rejects
[i
].strdup_strings
= 1;
188 void clear_unpack_trees_porcelain(struct unpack_trees_options
*opts
)
190 argv_array_clear(&opts
->msgs_to_free
);
191 memset(opts
->msgs
, 0, sizeof(opts
->msgs
));
194 static int do_add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
195 unsigned int set
, unsigned int clear
)
202 ce
->ce_flags
= (ce
->ce_flags
& ~clear
) | set
;
203 return add_index_entry(&o
->result
, ce
,
204 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
207 static struct cache_entry
*dup_entry(const struct cache_entry
*ce
)
209 unsigned int size
= ce_size(ce
);
210 struct cache_entry
*new_entry
= xmalloc(size
);
212 memcpy(new_entry
, ce
, size
);
216 static void add_entry(struct unpack_trees_options
*o
,
217 const struct cache_entry
*ce
,
218 unsigned int set
, unsigned int clear
)
220 do_add_entry(o
, dup_entry(ce
), set
, clear
);
224 * add error messages on path <path>
225 * corresponding to the type <e> with the message <msg>
226 * indicating if it should be display in porcelain or not
228 static int add_rejected_path(struct unpack_trees_options
*o
,
229 enum unpack_trees_error_types e
,
232 if (!o
->show_all_errors
)
233 return error(ERRORMSG(o
, e
), super_prefixed(path
));
236 * Otherwise, insert in a list for future display by
237 * display_error_msgs()
239 string_list_append(&o
->unpack_rejects
[e
], path
);
244 * display all the error messages stored in a nice way
246 static void display_error_msgs(struct unpack_trees_options
*o
)
249 int something_displayed
= 0;
250 for (e
= 0; e
< NB_UNPACK_TREES_ERROR_TYPES
; e
++) {
251 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
252 if (rejects
->nr
> 0) {
253 struct strbuf path
= STRBUF_INIT
;
254 something_displayed
= 1;
255 for (i
= 0; i
< rejects
->nr
; i
++)
256 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
257 error(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
258 strbuf_release(&path
);
260 string_list_clear(rejects
, 0);
262 if (something_displayed
)
263 fprintf(stderr
, _("Aborting\n"));
266 static int check_submodule_move_head(const struct cache_entry
*ce
,
269 struct unpack_trees_options
*o
)
271 unsigned flags
= SUBMODULE_MOVE_HEAD_DRY_RUN
;
272 const struct submodule
*sub
= submodule_from_ce(ce
);
278 flags
|= SUBMODULE_MOVE_HEAD_FORCE
;
280 if (submodule_move_head(ce
->name
, old_id
, new_id
, flags
))
281 return o
->gently
? -1 :
282 add_rejected_path(o
, ERROR_WOULD_LOSE_SUBMODULE
, ce
->name
);
287 * Preform the loading of the repository's gitmodules file. This function is
288 * used by 'check_update()' to perform loading of the gitmodules file in two
289 * differnt situations:
290 * (1) before removing entries from the working tree if the gitmodules file has
291 * been marked for removal. This situation is specified by 'state' == NULL.
292 * (2) before checking out entries to the working tree if the gitmodules file
293 * has been marked for update. This situation is specified by 'state' != NULL.
295 static void load_gitmodules_file(struct index_state
*index
,
296 struct checkout
*state
)
298 int pos
= index_name_pos(index
, GITMODULES_FILE
, strlen(GITMODULES_FILE
));
301 struct cache_entry
*ce
= index
->cache
[pos
];
302 if (!state
&& ce
->ce_flags
& CE_WT_REMOVE
) {
303 repo_read_gitmodules(the_repository
);
304 } else if (state
&& (ce
->ce_flags
& CE_UPDATE
)) {
305 submodule_free(the_repository
);
306 checkout_entry(ce
, state
, NULL
);
307 repo_read_gitmodules(the_repository
);
313 * Unlink the last component and schedule the leading directories for
314 * removal, such that empty directories get removed.
316 static void unlink_entry(const struct cache_entry
*ce
)
318 const struct submodule
*sub
= submodule_from_ce(ce
);
320 /* state.force is set at the caller. */
321 submodule_move_head(ce
->name
, "HEAD", NULL
,
322 SUBMODULE_MOVE_HEAD_FORCE
);
324 if (!check_leading_path(ce
->name
, ce_namelen(ce
)))
326 if (remove_or_warn(ce
->ce_mode
, ce
->name
))
328 schedule_dir_for_removal(ce
->name
, ce_namelen(ce
));
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(_("Checking out 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
)
392 struct progress
*progress
= NULL
;
393 struct index_state
*index
= &o
->result
;
394 struct checkout state
= CHECKOUT_INIT
;
399 state
.refresh_cache
= 1;
400 state
.istate
= index
;
403 setup_collided_checkout_detection(&state
, index
);
405 progress
= get_progress(o
);
408 git_attr_set_direction(GIT_ATTR_CHECKOUT
, index
);
410 if (should_update_submodules() && o
->update
&& !o
->dry_run
)
411 load_gitmodules_file(index
, NULL
);
413 for (i
= 0; i
< index
->cache_nr
; i
++) {
414 const struct cache_entry
*ce
= index
->cache
[i
];
416 if (ce
->ce_flags
& CE_WT_REMOVE
) {
417 display_progress(progress
, ++cnt
);
418 if (o
->update
&& !o
->dry_run
)
422 remove_marked_cache_entries(index
);
423 remove_scheduled_dirs();
425 if (should_update_submodules() && o
->update
&& !o
->dry_run
)
426 load_gitmodules_file(index
, &state
);
428 enable_delayed_checkout(&state
);
429 if (repository_format_partial_clone
&& o
->update
&& !o
->dry_run
) {
431 * Prefetch the objects that are to be checked out in the loop
434 struct oid_array to_fetch
= OID_ARRAY_INIT
;
435 int fetch_if_missing_store
= fetch_if_missing
;
436 fetch_if_missing
= 0;
437 for (i
= 0; i
< index
->cache_nr
; i
++) {
438 struct cache_entry
*ce
= index
->cache
[i
];
439 if ((ce
->ce_flags
& CE_UPDATE
) &&
440 !S_ISGITLINK(ce
->ce_mode
)) {
441 if (!has_object_file(&ce
->oid
))
442 oid_array_append(&to_fetch
, &ce
->oid
);
446 fetch_objects(repository_format_partial_clone
,
448 fetch_if_missing
= fetch_if_missing_store
;
449 oid_array_clear(&to_fetch
);
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 if (ce
->ce_flags
& CE_WT_REMOVE
)
456 BUG("both update and delete flags are set on %s",
458 display_progress(progress
, ++cnt
);
459 ce
->ce_flags
&= ~CE_UPDATE
;
460 if (o
->update
&& !o
->dry_run
) {
461 errs
|= checkout_entry(ce
, &state
, NULL
);
465 stop_progress(&progress
);
466 errs
|= finish_delayed_checkout(&state
);
468 git_attr_set_direction(GIT_ATTR_CHECKIN
, NULL
);
471 report_collided_checkout(index
);
476 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
477 struct unpack_trees_options
*o
);
478 static int verify_absent_sparse(const struct cache_entry
*ce
,
479 enum unpack_trees_error_types
,
480 struct unpack_trees_options
*o
);
482 static int apply_sparse_checkout(struct index_state
*istate
,
483 struct cache_entry
*ce
,
484 struct unpack_trees_options
*o
)
486 int was_skip_worktree
= ce_skip_worktree(ce
);
488 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
489 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
491 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
492 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
493 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
494 mark_fsmonitor_invalid(istate
, ce
);
495 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
499 * if (!was_skip_worktree && !ce_skip_worktree()) {
500 * This is perfectly normal. Move on;
505 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
506 * area as a result of ce_skip_worktree() shortcuts in
507 * verify_absent() and verify_uptodate().
508 * Make sure they don't modify worktree if they are already
509 * outside checkout area
511 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
512 ce
->ce_flags
&= ~CE_UPDATE
;
515 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
516 * on to get that file removed from both index and worktree.
517 * If that file is already outside worktree area, don't
520 if (ce
->ce_flags
& CE_REMOVE
)
521 ce
->ce_flags
&= ~CE_WT_REMOVE
;
524 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
526 * If CE_UPDATE is set, verify_uptodate() must be called already
527 * also stat info may have lost after merged_entry() so calling
528 * verify_uptodate() again may fail
530 if (!(ce
->ce_flags
& CE_UPDATE
) && verify_uptodate_sparse(ce
, o
))
532 ce
->ce_flags
|= CE_WT_REMOVE
;
533 ce
->ce_flags
&= ~CE_UPDATE
;
535 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
536 if (verify_absent_sparse(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
))
538 ce
->ce_flags
|= CE_UPDATE
;
543 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
544 struct unpack_trees_options
*o
)
546 int ret
= o
->fn(src
, o
);
552 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
554 ce
->ce_flags
|= CE_UNPACKED
;
556 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
557 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
558 int bottom
= o
->cache_bottom
;
559 while (bottom
< o
->src_index
->cache_nr
&&
560 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
562 o
->cache_bottom
= bottom
;
566 static void mark_all_ce_unused(struct index_state
*index
)
569 for (i
= 0; i
< index
->cache_nr
; i
++)
570 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
573 static int locate_in_src_index(const struct cache_entry
*ce
,
574 struct unpack_trees_options
*o
)
576 struct index_state
*index
= o
->src_index
;
577 int len
= ce_namelen(ce
);
578 int pos
= index_name_pos(index
, ce
->name
, len
);
585 * We call unpack_index_entry() with an unmerged cache entry
586 * only in diff-index, and it wants a single callback. Skip
587 * the other unmerged entry with the same name.
589 static void mark_ce_used_same_name(struct cache_entry
*ce
,
590 struct unpack_trees_options
*o
)
592 struct index_state
*index
= o
->src_index
;
593 int len
= ce_namelen(ce
);
596 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
597 struct cache_entry
*next
= index
->cache
[pos
];
598 if (len
!= ce_namelen(next
) ||
599 memcmp(ce
->name
, next
->name
, len
))
601 mark_ce_used(next
, o
);
605 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
607 const struct index_state
*index
= o
->src_index
;
608 int pos
= o
->cache_bottom
;
610 while (pos
< index
->cache_nr
) {
611 struct cache_entry
*ce
= index
->cache
[pos
];
612 if (!(ce
->ce_flags
& CE_UNPACKED
))
619 static void add_same_unmerged(const struct cache_entry
*ce
,
620 struct unpack_trees_options
*o
)
622 struct index_state
*index
= o
->src_index
;
623 int len
= ce_namelen(ce
);
624 int pos
= index_name_pos(index
, ce
->name
, len
);
627 die("programming error in a caller of mark_ce_used_same_name");
628 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
629 struct cache_entry
*next
= index
->cache
[pos
];
630 if (len
!= ce_namelen(next
) ||
631 memcmp(ce
->name
, next
->name
, len
))
633 add_entry(o
, next
, 0, 0);
634 mark_ce_used(next
, o
);
638 static int unpack_index_entry(struct cache_entry
*ce
,
639 struct unpack_trees_options
*o
)
641 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
648 if (o
->skip_unmerged
) {
649 add_entry(o
, ce
, 0, 0);
653 ret
= call_unpack_fn(src
, o
);
655 mark_ce_used_same_name(ce
, o
);
659 static int find_cache_pos(struct traverse_info
*, const struct name_entry
*);
661 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
663 struct unpack_trees_options
*o
= info
->data
;
665 if (o
->diff_index_cached
)
667 o
->cache_bottom
= bottom
;
670 static int switch_cache_bottom(struct traverse_info
*info
)
672 struct unpack_trees_options
*o
= info
->data
;
675 if (o
->diff_index_cached
)
677 ret
= o
->cache_bottom
;
678 pos
= find_cache_pos(info
->prev
, &info
->name
);
681 o
->cache_bottom
= -2 - pos
;
683 o
->cache_bottom
= o
->src_index
->cache_nr
;
687 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
689 return name_j
->oid
&& name_k
->oid
&& !oidcmp(name_j
->oid
, name_k
->oid
);
692 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
693 unsigned long df_conflicts
,
694 struct name_entry
*names
,
695 struct traverse_info
*info
)
699 struct tree_desc t
[MAX_UNPACK_TREES
];
700 void *buf
[MAX_UNPACK_TREES
];
701 struct traverse_info newinfo
;
702 struct name_entry
*p
;
710 newinfo
.pathspec
= info
->pathspec
;
712 newinfo
.pathlen
+= tree_entry_len(p
) + 1;
713 newinfo
.df_conflicts
|= df_conflicts
;
716 * Fetch the tree from the ODB for each peer directory in the
719 * For 2- and 3-way traversals, we try to avoid hitting the
720 * ODB twice for the same OID. This should yield a nice speed
721 * up in checkouts and merges when the commits are similar.
723 * We don't bother doing the full O(n^2) search for larger n,
724 * because wider traversals don't happen that often and we
725 * avoid the search setup.
727 * When 2 peer OIDs are the same, we just copy the tree
728 * descriptor data. This implicitly borrows the buffer
729 * data from the earlier cell.
731 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
732 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
734 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
737 const struct object_id
*oid
= NULL
;
740 buf
[nr_buf
++] = fill_tree_descriptor(t
+ i
, oid
);
744 bottom
= switch_cache_bottom(&newinfo
);
745 ret
= traverse_trees(n
, t
, &newinfo
);
746 restore_cache_bottom(&newinfo
, bottom
);
748 for (i
= 0; i
< nr_buf
; i
++)
755 * Compare the traverse-path to the cache entry without actually
756 * having to generate the textual representation of the traverse
759 * NOTE! This *only* compares up to the size of the traverse path
760 * itself - the caller needs to do the final check for the cache
761 * entry having more data at the end!
763 static int do_compare_entry_piecewise(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
765 int len
, pathlen
, ce_len
;
769 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
774 pathlen
= info
->pathlen
;
775 ce_len
= ce_namelen(ce
);
777 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
778 if (ce_len
< pathlen
)
782 ce_name
= ce
->name
+ pathlen
;
784 len
= tree_entry_len(n
);
785 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
788 static int do_compare_entry(const struct cache_entry
*ce
,
789 const struct traverse_info
*info
,
790 const struct name_entry
*n
)
792 int len
, pathlen
, ce_len
;
797 * If we have not precomputed the traverse path, it is quicker
798 * to avoid doing so. But if we have precomputed it,
799 * it is quicker to use the precomputed version.
801 if (!info
->traverse_path
)
802 return do_compare_entry_piecewise(ce
, info
, n
);
804 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
808 pathlen
= info
->pathlen
;
809 ce_len
= ce_namelen(ce
);
811 if (ce_len
< pathlen
)
815 ce_name
= ce
->name
+ pathlen
;
817 len
= tree_entry_len(n
);
818 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
821 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
823 int cmp
= do_compare_entry(ce
, info
, n
);
828 * Even if the beginning compared identically, the ce should
829 * compare as bigger than a directory leading up to it!
831 return ce_namelen(ce
) > traverse_path_len(info
, n
);
834 static int ce_in_traverse_path(const struct cache_entry
*ce
,
835 const struct traverse_info
*info
)
839 if (do_compare_entry(ce
, info
->prev
, &info
->name
))
842 * If ce (blob) is the same name as the path (which is a tree
843 * we will be descending into), it won't be inside it.
845 return (info
->pathlen
< ce_namelen(ce
));
848 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
, const struct name_entry
*n
, int stage
)
850 int len
= traverse_path_len(info
, n
);
851 struct cache_entry
*ce
= xcalloc(1, cache_entry_size(len
));
853 ce
->ce_mode
= create_ce_mode(n
->mode
);
854 ce
->ce_flags
= create_ce_flags(stage
);
855 ce
->ce_namelen
= len
;
856 oidcpy(&ce
->oid
, n
->oid
);
857 make_traverse_path(ce
->name
, info
, n
);
862 static int unpack_nondirectories(int n
, unsigned long mask
,
863 unsigned long dirmask
,
864 struct cache_entry
**src
,
865 const struct name_entry
*names
,
866 const struct traverse_info
*info
)
869 struct unpack_trees_options
*o
= info
->data
;
870 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
872 /* Do we have *only* directories? Nothing to do */
873 if (mask
== dirmask
&& !src
[0])
877 * Ok, we've filled in up to any potential index entry in src[0],
880 for (i
= 0; i
< n
; i
++) {
882 unsigned int bit
= 1ul << i
;
883 if (conflicts
& bit
) {
884 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
891 else if (i
+ 1 < o
->head_idx
)
893 else if (i
+ 1 > o
->head_idx
)
897 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
);
901 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
903 for (i
= 0; i
< n
; i
++) {
904 struct cache_entry
*ce
= src
[i
+ o
->merge
];
905 if (ce
!= o
->df_conflict_entry
)
911 for (i
= 0; i
< n
; i
++)
912 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
913 if (do_add_entry(o
, src
[i
], 0, 0))
919 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
921 discard_index(&o
->result
);
922 if (!o
->gently
&& !o
->exiting_early
) {
924 return error("%s", message
);
931 * The tree traversal is looking at name p. If we have a matching entry,
932 * return it. If name p is a directory in the index, do not return
933 * anything, as we will want to match it when the traversal descends into
936 static int find_cache_pos(struct traverse_info
*info
,
937 const struct name_entry
*p
)
940 struct unpack_trees_options
*o
= info
->data
;
941 struct index_state
*index
= o
->src_index
;
942 int pfxlen
= info
->pathlen
;
943 int p_len
= tree_entry_len(p
);
945 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
946 const struct cache_entry
*ce
= index
->cache
[pos
];
947 const char *ce_name
, *ce_slash
;
950 if (ce
->ce_flags
& CE_UNPACKED
) {
952 * cache_bottom entry is already unpacked, so
953 * we can never match it; don't check it
956 if (pos
== o
->cache_bottom
)
960 if (!ce_in_traverse_path(ce
, info
)) {
962 * Check if we can skip future cache checks
963 * (because we're already past all possible
964 * entries in the traverse path).
966 if (info
->traverse_path
) {
967 if (strncmp(ce
->name
, info
->traverse_path
,
973 ce_name
= ce
->name
+ pfxlen
;
974 ce_slash
= strchr(ce_name
, '/');
976 ce_len
= ce_slash
- ce_name
;
978 ce_len
= ce_namelen(ce
) - pfxlen
;
979 cmp
= name_compare(p
->path
, p_len
, ce_name
, ce_len
);
981 * Exact match; if we have a directory we need to
982 * delay returning it.
985 return ce_slash
? -2 - pos
: pos
;
987 continue; /* keep looking */
989 * ce_name sorts after p->path; could it be that we
990 * have files under p->path directory in the index?
991 * E.g. ce_name == "t-i", and p->path == "t"; we may
992 * have "t/a" in the index.
994 if (p_len
< ce_len
&& !memcmp(ce_name
, p
->path
, p_len
) &&
995 ce_name
[p_len
] < '/')
996 continue; /* keep looking */
1002 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
1003 const struct name_entry
*p
)
1005 int pos
= find_cache_pos(info
, p
);
1006 struct unpack_trees_options
*o
= info
->data
;
1009 return o
->src_index
->cache
[pos
];
1014 static void debug_path(struct traverse_info
*info
)
1017 debug_path(info
->prev
);
1018 if (*info
->prev
->name
.path
)
1021 printf("%s", info
->name
.path
);
1024 static void debug_name_entry(int i
, struct name_entry
*n
)
1026 printf("ent#%d %06o %s\n", i
,
1027 n
->path
? n
->mode
: 0,
1028 n
->path
? n
->path
: "(missing)");
1031 static void debug_unpack_callback(int n
,
1033 unsigned long dirmask
,
1034 struct name_entry
*names
,
1035 struct traverse_info
*info
)
1038 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
1042 for (i
= 0; i
< n
; i
++)
1043 debug_name_entry(i
, names
+ i
);
1046 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
1048 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
1049 struct unpack_trees_options
*o
= info
->data
;
1050 const struct name_entry
*p
= names
;
1052 /* Find first entry with a real name (we could use "mask" too) */
1056 if (o
->debug_unpack
)
1057 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
1059 /* Are we supposed to look at the index too? */
1063 struct cache_entry
*ce
;
1065 if (o
->diff_index_cached
)
1066 ce
= next_cache_entry(o
);
1068 ce
= find_cache_entry(info
, p
);
1072 cmp
= compare_entry(ce
, info
, p
);
1074 if (unpack_index_entry(ce
, o
) < 0)
1075 return unpack_failed(o
, NULL
);
1081 * If we skip unmerged index
1082 * entries, we'll skip this
1083 * entry *and* the tree
1084 * entries associated with it!
1086 if (o
->skip_unmerged
) {
1087 add_same_unmerged(ce
, o
);
1097 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
1100 if (o
->merge
&& src
[0]) {
1101 if (ce_stage(src
[0]))
1102 mark_ce_used_same_name(src
[0], o
);
1104 mark_ce_used(src
[0], o
);
1107 /* Now handle any directories.. */
1109 /* special case: "diff-index --cached" looking at a tree */
1110 if (o
->diff_index_cached
&&
1111 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1113 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1116 * Everything under the name matches; skip the
1117 * entire hierarchy. diff_index_cached codepath
1118 * special cases D/F conflicts in such a way that
1119 * it does not do any look-ahead, so this is safe.
1122 o
->cache_bottom
+= matches
;
1127 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1136 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1137 struct strbuf
*prefix
,
1138 int select_mask
, int clear_mask
,
1139 struct exclude_list
*el
, int defval
);
1141 /* Whole directory matching */
1142 static int clear_ce_flags_dir(struct cache_entry
**cache
, int nr
,
1143 struct strbuf
*prefix
,
1145 int select_mask
, int clear_mask
,
1146 struct exclude_list
*el
, int defval
)
1148 struct cache_entry
**cache_end
;
1150 int ret
= is_excluded_from_list(prefix
->buf
, prefix
->len
,
1151 basename
, &dtype
, el
, &the_index
);
1154 strbuf_addch(prefix
, '/');
1156 /* If undecided, use matching result of parent dir in defval */
1160 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1161 struct cache_entry
*ce
= *cache_end
;
1162 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1167 * TODO: check el, if there are no patterns that may conflict
1168 * with ret (iow, we know in advance the incl/excl
1169 * decision for the entire directory), clear flag here without
1170 * calling clear_ce_flags_1(). That function will call
1171 * the expensive is_excluded_from_list() on every entry.
1173 rc
= clear_ce_flags_1(cache
, cache_end
- cache
,
1175 select_mask
, clear_mask
,
1177 strbuf_setlen(prefix
, prefix
->len
- 1);
1182 * Traverse the index, find every entry that matches according to
1183 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
1184 * number of traversed entries.
1186 * If select_mask is non-zero, only entries whose ce_flags has on of
1187 * those bits enabled are traversed.
1189 * cache : pointer to an index entry
1190 * prefix_len : an offset to its path
1192 * The current path ("prefix") including the trailing '/' is
1193 * cache[0]->name[0..(prefix_len-1)]
1194 * Top level path has prefix_len zero.
1196 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1197 struct strbuf
*prefix
,
1198 int select_mask
, int clear_mask
,
1199 struct exclude_list
*el
, int defval
)
1201 struct cache_entry
**cache_end
= cache
+ nr
;
1204 * Process all entries that have the given prefix and meet
1205 * select_mask condition
1207 while(cache
!= cache_end
) {
1208 struct cache_entry
*ce
= *cache
;
1209 const char *name
, *slash
;
1210 int len
, dtype
, ret
;
1212 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1217 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1220 name
= ce
->name
+ prefix
->len
;
1221 slash
= strchr(name
, '/');
1223 /* If it's a directory, try whole directory match first */
1228 strbuf_add(prefix
, name
, len
);
1230 processed
= clear_ce_flags_dir(cache
, cache_end
- cache
,
1232 prefix
->buf
+ prefix
->len
- len
,
1233 select_mask
, clear_mask
,
1236 /* clear_c_f_dir eats a whole dir already? */
1239 strbuf_setlen(prefix
, prefix
->len
- len
);
1243 strbuf_addch(prefix
, '/');
1244 cache
+= clear_ce_flags_1(cache
, cache_end
- cache
,
1246 select_mask
, clear_mask
, el
, defval
);
1247 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1252 dtype
= ce_to_dtype(ce
);
1253 ret
= is_excluded_from_list(ce
->name
, ce_namelen(ce
),
1254 name
, &dtype
, el
, &the_index
);
1258 ce
->ce_flags
&= ~clear_mask
;
1261 return nr
- (cache_end
- cache
);
1264 static int clear_ce_flags(struct cache_entry
**cache
, int nr
,
1265 int select_mask
, int clear_mask
,
1266 struct exclude_list
*el
)
1268 static struct strbuf prefix
= STRBUF_INIT
;
1270 strbuf_reset(&prefix
);
1272 return clear_ce_flags_1(cache
, nr
,
1274 select_mask
, clear_mask
,
1279 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1281 static void mark_new_skip_worktree(struct exclude_list
*el
,
1282 struct index_state
*the_index
,
1283 int select_flag
, int skip_wt_flag
)
1288 * 1. Pretend the narrowest worktree: only unmerged entries
1291 for (i
= 0; i
< the_index
->cache_nr
; i
++) {
1292 struct cache_entry
*ce
= the_index
->cache
[i
];
1294 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1297 if (!ce_stage(ce
) && !(ce
->ce_flags
& CE_CONFLICTED
))
1298 ce
->ce_flags
|= skip_wt_flag
;
1300 ce
->ce_flags
&= ~skip_wt_flag
;
1304 * 2. Widen worktree according to sparse-checkout file.
1305 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1307 clear_ce_flags(the_index
->cache
, the_index
->cache_nr
,
1308 select_flag
, skip_wt_flag
, el
);
1311 static int verify_absent(const struct cache_entry
*,
1312 enum unpack_trees_error_types
,
1313 struct unpack_trees_options
*);
1315 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1316 * resulting index, -2 on failure to reflect the changes to the work tree.
1318 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1320 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1323 static struct cache_entry
*dfc
;
1324 struct exclude_list el
;
1326 if (len
> MAX_UNPACK_TREES
)
1327 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1329 memset(&el
, 0, sizeof(el
));
1330 if (!core_apply_sparse_checkout
|| !o
->update
)
1331 o
->skip_sparse_checkout
= 1;
1332 if (!o
->skip_sparse_checkout
) {
1333 char *sparse
= git_pathdup("info/sparse-checkout");
1334 if (add_excludes_from_file_to_list(sparse
, "", 0, &el
, NULL
) < 0)
1335 o
->skip_sparse_checkout
= 1;
1341 memset(&o
->result
, 0, sizeof(o
->result
));
1342 o
->result
.initialized
= 1;
1343 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1344 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1345 o
->result
.version
= o
->src_index
->version
;
1346 if (!o
->src_index
->split_index
) {
1347 o
->result
.split_index
= NULL
;
1348 } else if (o
->src_index
== o
->dst_index
) {
1350 * o->dst_index (and thus o->src_index) will be discarded
1351 * and overwritten with o->result at the end of this function,
1352 * so just use src_index's split_index to avoid having to
1355 o
->result
.split_index
= o
->src_index
->split_index
;
1356 o
->result
.split_index
->refcount
++;
1358 o
->result
.split_index
= init_split_index(&o
->result
);
1360 oidcpy(&o
->result
.oid
, &o
->src_index
->oid
);
1361 o
->merge_size
= len
;
1362 mark_all_ce_unused(o
->src_index
);
1365 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1367 if (!o
->skip_sparse_checkout
)
1368 mark_new_skip_worktree(o
->el
, o
->src_index
, 0, CE_NEW_SKIP_WORKTREE
);
1371 dfc
= xcalloc(1, cache_entry_size(0));
1372 o
->df_conflict_entry
= dfc
;
1375 const char *prefix
= o
->prefix
? o
->prefix
: "";
1376 struct traverse_info info
;
1378 setup_traverse_info(&info
, prefix
);
1379 info
.fn
= unpack_callback
;
1381 info
.show_all_errors
= o
->show_all_errors
;
1382 info
.pathspec
= o
->pathspec
;
1386 * Unpack existing index entries that sort before the
1387 * prefix the tree is spliced into. Note that o->merge
1388 * is always true in this case.
1391 struct cache_entry
*ce
= next_cache_entry(o
);
1394 if (ce_in_traverse_path(ce
, &info
))
1396 if (unpack_index_entry(ce
, o
) < 0)
1401 if (traverse_trees(len
, t
, &info
) < 0)
1405 /* Any left-over entries in the index? */
1408 struct cache_entry
*ce
= next_cache_entry(o
);
1411 if (unpack_index_entry(ce
, o
) < 0)
1415 mark_all_ce_unused(o
->src_index
);
1417 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1418 ret
= unpack_failed(o
, "Merge requires file-level merging");
1422 if (!o
->skip_sparse_checkout
) {
1423 int empty_worktree
= 1;
1426 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1427 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1428 * so apply_sparse_checkout() won't attempt to remove it from worktree
1430 mark_new_skip_worktree(o
->el
, &o
->result
, CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1433 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1434 struct cache_entry
*ce
= o
->result
.cache
[i
];
1437 * Entries marked with CE_ADDED in merged_entry() do not have
1438 * verify_absent() check (the check is effectively disabled
1439 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1441 * Do the real check now because we have had
1442 * correct CE_NEW_SKIP_WORKTREE
1444 if (ce
->ce_flags
& CE_ADDED
&&
1445 verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1446 if (!o
->show_all_errors
)
1451 if (apply_sparse_checkout(&o
->result
, ce
, o
)) {
1452 if (!o
->show_all_errors
)
1456 if (!ce_skip_worktree(ce
))
1463 * Sparse checkout is meant to narrow down checkout area
1464 * but it does not make sense to narrow down to empty working
1465 * tree. This is usually a mistake in sparse checkout rules.
1466 * Do not allow users to do that.
1468 if (o
->result
.cache_nr
&& empty_worktree
) {
1469 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1474 ret
= check_updates(o
) ? (-2) : 0;
1477 if (!o
->result
.cache_tree
)
1478 o
->result
.cache_tree
= cache_tree();
1479 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1480 cache_tree_update(&o
->result
,
1484 move_index_extensions(&o
->result
, o
->src_index
);
1485 discard_index(o
->dst_index
);
1486 *o
->dst_index
= o
->result
;
1488 discard_index(&o
->result
);
1490 o
->src_index
= NULL
;
1493 clear_exclude_list(&el
);
1497 if (o
->show_all_errors
)
1498 display_error_msgs(o
);
1499 mark_all_ce_unused(o
->src_index
);
1500 ret
= unpack_failed(o
, NULL
);
1501 if (o
->exiting_early
)
1506 /* Here come the merge functions */
1508 static int reject_merge(const struct cache_entry
*ce
,
1509 struct unpack_trees_options
*o
)
1511 return o
->gently
? -1 :
1512 add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1515 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1521 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1523 return a
->ce_mode
== b
->ce_mode
&&
1524 !oidcmp(&a
->oid
, &b
->oid
);
1529 * When a CE gets turned into an unmerged entry, we
1530 * want it to be up-to-date
1532 static int verify_uptodate_1(const struct cache_entry
*ce
,
1533 struct unpack_trees_options
*o
,
1534 enum unpack_trees_error_types error_type
)
1542 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1543 * if this entry is truly up-to-date because this file may be
1546 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1547 ; /* keep checking */
1548 else if (o
->reset
|| ce_uptodate(ce
))
1551 if (!lstat(ce
->name
, &st
)) {
1552 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1553 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1555 if (submodule_from_ce(ce
)) {
1556 int r
= check_submodule_move_head(ce
,
1557 "HEAD", oid_to_hex(&ce
->oid
), o
);
1559 return o
->gently
? -1 :
1560 add_rejected_path(o
, error_type
, ce
->name
);
1567 * Historic default policy was to allow submodule to be out
1568 * of sync wrt the superproject index. If the submodule was
1569 * not considered interesting above, we don't care here.
1571 if (S_ISGITLINK(ce
->ce_mode
))
1576 if (errno
== ENOENT
)
1578 return o
->gently
? -1 :
1579 add_rejected_path(o
, error_type
, ce
->name
);
1582 int verify_uptodate(const struct cache_entry
*ce
,
1583 struct unpack_trees_options
*o
)
1585 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1587 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1590 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1591 struct unpack_trees_options
*o
)
1593 return verify_uptodate_1(ce
, o
, ERROR_SPARSE_NOT_UPTODATE_FILE
);
1596 static void invalidate_ce_path(const struct cache_entry
*ce
,
1597 struct unpack_trees_options
*o
)
1601 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1602 untracked_cache_invalidate_path(o
->src_index
, ce
->name
, 1);
1606 * Check that checking out ce->sha1 in subdir ce->name is not
1607 * going to overwrite any working files.
1609 * Currently, git does not checkout subprojects during a superproject
1610 * checkout, so it is not going to overwrite anything.
1612 static int verify_clean_submodule(const char *old_sha1
,
1613 const struct cache_entry
*ce
,
1614 enum unpack_trees_error_types error_type
,
1615 struct unpack_trees_options
*o
)
1617 if (!submodule_from_ce(ce
))
1620 return check_submodule_move_head(ce
, old_sha1
,
1621 oid_to_hex(&ce
->oid
), o
);
1624 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1625 enum unpack_trees_error_types error_type
,
1626 struct unpack_trees_options
*o
)
1629 * we are about to extract "ce->name"; we would not want to lose
1630 * anything in the existing directory there.
1634 struct dir_struct d
;
1638 if (S_ISGITLINK(ce
->ce_mode
)) {
1639 struct object_id oid
;
1640 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", &oid
);
1642 * If we are not going to update the submodule, then
1645 if (!sub_head
&& !oidcmp(&oid
, &ce
->oid
))
1647 return verify_clean_submodule(sub_head
? NULL
: oid_to_hex(&oid
),
1652 * First let's make sure we do not have a local modification
1653 * in that directory.
1655 namelen
= ce_namelen(ce
);
1656 for (i
= locate_in_src_index(ce
, o
);
1657 i
< o
->src_index
->cache_nr
;
1659 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1660 int len
= ce_namelen(ce2
);
1661 if (len
< namelen
||
1662 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1663 ce2
->name
[namelen
] != '/')
1666 * ce2->name is an entry in the subdirectory to be
1669 if (!ce_stage(ce2
)) {
1670 if (verify_uptodate(ce2
, o
))
1672 add_entry(o
, ce2
, CE_REMOVE
, 0);
1673 mark_ce_used(ce2
, o
);
1679 * Then we need to make sure that we do not lose a locally
1680 * present file that is not ignored.
1682 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
1684 memset(&d
, 0, sizeof(d
));
1686 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
1687 i
= read_directory(&d
, &the_index
, pathbuf
, namelen
+1, NULL
);
1689 return o
->gently
? -1 :
1690 add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
1696 * This gets called when there was no index entry for the tree entry 'dst',
1697 * but we found a file in the working tree that 'lstat()' said was fine,
1698 * and we're on a case-insensitive filesystem.
1700 * See if we can find a case-insensitive match in the index that also
1701 * matches the stat information, and assume it's that other file!
1703 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
1705 const struct cache_entry
*src
;
1707 src
= index_file_exists(o
->src_index
, name
, len
, 1);
1708 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
1711 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
1712 const struct cache_entry
*ce
, struct stat
*st
,
1713 enum unpack_trees_error_types error_type
,
1714 struct unpack_trees_options
*o
)
1716 const struct cache_entry
*result
;
1719 * It may be that the 'lstat()' succeeded even though
1720 * target 'ce' was absent, because there is an old
1721 * entry that is different only in case..
1723 * Ignore that lstat() if it matches.
1725 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
1729 is_excluded(o
->dir
, &the_index
, name
, &dtype
))
1731 * ce->name is explicitly excluded, so it is Ok to
1735 if (S_ISDIR(st
->st_mode
)) {
1737 * We are checking out path "foo" and
1738 * found "foo/." in the working tree.
1739 * This is tricky -- if we have modified
1740 * files that are in "foo/" we would lose
1743 if (verify_clean_subdirectory(ce
, error_type
, o
) < 0)
1749 * The previous round may already have decided to
1750 * delete this path, which is in a subdirectory that
1751 * is being replaced with a blob.
1753 result
= index_file_exists(&o
->result
, name
, len
, 0);
1755 if (result
->ce_flags
& CE_REMOVE
)
1759 return o
->gently
? -1 :
1760 add_rejected_path(o
, error_type
, name
);
1764 * We do not want to remove or overwrite a working tree file that
1765 * is not tracked, unless it is ignored.
1767 static int verify_absent_1(const struct cache_entry
*ce
,
1768 enum unpack_trees_error_types error_type
,
1769 struct unpack_trees_options
*o
)
1774 if (o
->index_only
|| o
->reset
|| !o
->update
)
1777 len
= check_leading_path(ce
->name
, ce_namelen(ce
));
1784 path
= xmemdupz(ce
->name
, len
);
1785 if (lstat(path
, &st
))
1786 ret
= error_errno("cannot stat '%s'", path
);
1788 if (submodule_from_ce(ce
))
1789 ret
= check_submodule_move_head(ce
,
1790 oid_to_hex(&ce
->oid
),
1793 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
1794 &st
, error_type
, o
);
1798 } else if (lstat(ce
->name
, &st
)) {
1799 if (errno
!= ENOENT
)
1800 return error_errno("cannot stat '%s'", ce
->name
);
1803 if (submodule_from_ce(ce
))
1804 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
1807 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
1808 ce_to_dtype(ce
), ce
, &st
,
1813 static int verify_absent(const struct cache_entry
*ce
,
1814 enum unpack_trees_error_types error_type
,
1815 struct unpack_trees_options
*o
)
1817 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1819 return verify_absent_1(ce
, error_type
, o
);
1822 static int verify_absent_sparse(const struct cache_entry
*ce
,
1823 enum unpack_trees_error_types error_type
,
1824 struct unpack_trees_options
*o
)
1826 enum unpack_trees_error_types orphaned_error
= error_type
;
1827 if (orphaned_error
== ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
)
1828 orphaned_error
= ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
;
1830 return verify_absent_1(ce
, orphaned_error
, o
);
1833 static int merged_entry(const struct cache_entry
*ce
,
1834 const struct cache_entry
*old
,
1835 struct unpack_trees_options
*o
)
1837 int update
= CE_UPDATE
;
1838 struct cache_entry
*merge
= dup_entry(ce
);
1842 * New index entries. In sparse checkout, the following
1843 * verify_absent() will be delayed until after
1844 * traverse_trees() finishes in unpack_trees(), then:
1846 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1847 * - verify_absent() be called again, this time with
1848 * correct CE_NEW_SKIP_WORKTREE
1850 * verify_absent() call here does nothing in sparse
1851 * checkout (i.e. o->skip_sparse_checkout == 0)
1854 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
1856 if (verify_absent(merge
,
1857 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1861 invalidate_ce_path(merge
, o
);
1863 if (submodule_from_ce(ce
)) {
1864 int ret
= check_submodule_move_head(ce
, NULL
,
1865 oid_to_hex(&ce
->oid
),
1871 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
1873 * See if we can re-use the old CE directly?
1874 * That way we get the uptodate stat info.
1876 * This also removes the UPDATE flag on a match; otherwise
1877 * we will end up overwriting local changes in the work tree.
1879 if (same(old
, merge
)) {
1880 copy_cache_entry(merge
, old
);
1883 if (verify_uptodate(old
, o
)) {
1887 /* Migrate old flags over */
1888 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1889 invalidate_ce_path(old
, o
);
1892 if (submodule_from_ce(ce
)) {
1893 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
1894 oid_to_hex(&ce
->oid
),
1901 * Previously unmerged entry left as an existence
1902 * marker by read_index_unmerged();
1904 invalidate_ce_path(old
, o
);
1907 do_add_entry(o
, merge
, update
, CE_STAGEMASK
);
1911 static int deleted_entry(const struct cache_entry
*ce
,
1912 const struct cache_entry
*old
,
1913 struct unpack_trees_options
*o
)
1915 /* Did it exist in the index? */
1917 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1921 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
1923 add_entry(o
, ce
, CE_REMOVE
, 0);
1924 invalidate_ce_path(ce
, o
);
1928 static int keep_entry(const struct cache_entry
*ce
,
1929 struct unpack_trees_options
*o
)
1931 add_entry(o
, ce
, 0, 0);
1936 static void show_stage_entry(FILE *o
,
1937 const char *label
, const struct cache_entry
*ce
)
1940 fprintf(o
, "%s (missing)\n", label
);
1942 fprintf(o
, "%s%06o %s %d\t%s\n",
1945 oid_to_hex(&ce
->oid
),
1951 int threeway_merge(const struct cache_entry
* const *stages
,
1952 struct unpack_trees_options
*o
)
1954 const struct cache_entry
*index
;
1955 const struct cache_entry
*head
;
1956 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
1959 int remote_match
= 0;
1961 int df_conflict_head
= 0;
1962 int df_conflict_remote
= 0;
1964 int any_anc_missing
= 0;
1965 int no_anc_exists
= 1;
1968 for (i
= 1; i
< o
->head_idx
; i
++) {
1969 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
1970 any_anc_missing
= 1;
1976 head
= stages
[o
->head_idx
];
1978 if (head
== o
->df_conflict_entry
) {
1979 df_conflict_head
= 1;
1983 if (remote
== o
->df_conflict_entry
) {
1984 df_conflict_remote
= 1;
1989 * First, if there's a #16 situation, note that to prevent #13
1992 if (!same(remote
, head
)) {
1993 for (i
= 1; i
< o
->head_idx
; i
++) {
1994 if (same(stages
[i
], head
)) {
1997 if (same(stages
[i
], remote
)) {
2004 * We start with cases where the index is allowed to match
2005 * something other than the head: #14(ALT) and #2ALT, where it
2006 * is permitted to match the result instead.
2008 /* #14, #14ALT, #2ALT */
2009 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
2010 if (index
&& !same(index
, remote
) && !same(index
, head
))
2011 return reject_merge(index
, o
);
2012 return merged_entry(remote
, index
, o
);
2015 * If we have an entry in the index cache, then we want to
2016 * make sure that it matches head.
2018 if (index
&& !same(index
, head
))
2019 return reject_merge(index
, o
);
2023 if (same(head
, remote
))
2024 return merged_entry(head
, index
, o
);
2026 if (!df_conflict_remote
&& remote_match
&& !head_match
)
2027 return merged_entry(head
, index
, o
);
2031 if (!head
&& !remote
&& any_anc_missing
)
2035 * Under the "aggressive" rule, we resolve mostly trivial
2036 * cases that we historically had git-merge-one-file resolve.
2038 if (o
->aggressive
) {
2039 int head_deleted
= !head
;
2040 int remote_deleted
= !remote
;
2041 const struct cache_entry
*ce
= NULL
;
2050 for (i
= 1; i
< o
->head_idx
; i
++) {
2051 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2060 * Deleted in one and unchanged in the other.
2062 if ((head_deleted
&& remote_deleted
) ||
2063 (head_deleted
&& remote
&& remote_match
) ||
2064 (remote_deleted
&& head
&& head_match
)) {
2066 return deleted_entry(index
, index
, o
);
2067 if (ce
&& !head_deleted
) {
2068 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2074 * Added in both, identically.
2076 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
2077 return merged_entry(head
, index
, o
);
2081 /* Below are "no merge" cases, which require that the index be
2082 * up-to-date to avoid the files getting overwritten with
2083 * conflict resolution files.
2086 if (verify_uptodate(index
, o
))
2090 o
->nontrivial_merge
= 1;
2092 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2094 if (!head_match
|| !remote_match
) {
2095 for (i
= 1; i
< o
->head_idx
; i
++) {
2096 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2097 keep_entry(stages
[i
], o
);
2105 fprintf(stderr
, "read-tree: warning #16 detected\n");
2106 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2107 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2110 if (head
) { count
+= keep_entry(head
, o
); }
2111 if (remote
) { count
+= keep_entry(remote
, o
); }
2118 * The rule is to "carry forward" what is in the index without losing
2119 * information across a "fast-forward", favoring a successful merge
2120 * over a merge failure when it makes sense. For details of the
2121 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2124 int twoway_merge(const struct cache_entry
* const *src
,
2125 struct unpack_trees_options
*o
)
2127 const struct cache_entry
*current
= src
[0];
2128 const struct cache_entry
*oldtree
= src
[1];
2129 const struct cache_entry
*newtree
= src
[2];
2131 if (o
->merge_size
!= 2)
2132 return error("Cannot do a twoway merge of %d trees",
2135 if (oldtree
== o
->df_conflict_entry
)
2137 if (newtree
== o
->df_conflict_entry
)
2141 if (current
->ce_flags
& CE_CONFLICTED
) {
2142 if (same(oldtree
, newtree
) || o
->reset
) {
2144 return deleted_entry(current
, current
, o
);
2146 return merged_entry(newtree
, current
, o
);
2148 return reject_merge(current
, o
);
2149 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2150 (!oldtree
&& newtree
&&
2151 same(current
, newtree
)) || /* 6 and 7 */
2152 (oldtree
&& newtree
&&
2153 same(oldtree
, newtree
)) || /* 14 and 15 */
2154 (oldtree
&& newtree
&&
2155 !same(oldtree
, newtree
) && /* 18 and 19 */
2156 same(current
, newtree
))) {
2157 return keep_entry(current
, o
);
2158 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2160 return deleted_entry(oldtree
, current
, o
);
2161 } else if (oldtree
&& newtree
&&
2162 same(current
, oldtree
) && !same(current
, newtree
)) {
2164 return merged_entry(newtree
, current
, o
);
2166 return reject_merge(current
, o
);
2169 if (oldtree
&& !o
->initial_checkout
) {
2171 * deletion of the path was staged;
2173 if (same(oldtree
, newtree
))
2175 return reject_merge(oldtree
, o
);
2177 return merged_entry(newtree
, current
, o
);
2179 return deleted_entry(oldtree
, current
, o
);
2185 * Keep the index entries at stage0, collapse stage1 but make sure
2186 * stage0 does not have anything there.
2188 int bind_merge(const struct cache_entry
* const *src
,
2189 struct unpack_trees_options
*o
)
2191 const struct cache_entry
*old
= src
[0];
2192 const struct cache_entry
*a
= src
[1];
2194 if (o
->merge_size
!= 1)
2195 return error("Cannot do a bind merge of %d trees",
2198 return o
->gently
? -1 :
2199 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2200 super_prefixed(a
->name
),
2201 super_prefixed(old
->name
));
2203 return keep_entry(old
, o
);
2205 return merged_entry(a
, NULL
, o
);
2212 * - take the stat information from stage0, take the data from stage1
2214 int oneway_merge(const struct cache_entry
* const *src
,
2215 struct unpack_trees_options
*o
)
2217 const struct cache_entry
*old
= src
[0];
2218 const struct cache_entry
*a
= src
[1];
2220 if (o
->merge_size
!= 1)
2221 return error("Cannot do a oneway merge of %d trees",
2224 if (!a
|| a
== o
->df_conflict_entry
)
2225 return deleted_entry(old
, old
, o
);
2227 if (old
&& same(old
, a
)) {
2229 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
)) {
2231 if (lstat(old
->name
, &st
) ||
2232 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2233 update
|= CE_UPDATE
;
2235 if (o
->update
&& S_ISGITLINK(old
->ce_mode
) &&
2236 should_update_submodules() && !verify_uptodate(old
, o
))
2237 update
|= CE_UPDATE
;
2238 add_entry(o
, old
, update
, 0);
2241 return merged_entry(a
, old
, o
);