1 #define NO_THE_INDEX_COMPATIBILITY_MACROS
3 #include "repository.h"
8 #include "cache-tree.h"
9 #include "unpack-trees.h"
13 #include "split-index.h"
15 #include "submodule.h"
16 #include "submodule-config.h"
17 #include "fetch-object.h"
20 * Error messages expected by scripts out of plumbing commands such as
21 * read-tree. Non-scripted Porcelain is not required to use these messages
22 * and in fact are encouraged to reword them to better suit their particular
23 * situation better. See how "git checkout" and "git merge" replaces
24 * them using setup_unpack_trees_porcelain(), for example.
26 static const char *unpack_plumbing_errors
[NB_UNPACK_TREES_ERROR_TYPES
] = {
27 /* ERROR_WOULD_OVERWRITE */
28 "Entry '%s' would be overwritten by merge. Cannot merge.",
30 /* ERROR_NOT_UPTODATE_FILE */
31 "Entry '%s' not uptodate. Cannot merge.",
33 /* ERROR_NOT_UPTODATE_DIR */
34 "Updating '%s' would lose untracked files in it",
36 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
37 "Untracked working tree file '%s' would be overwritten by merge.",
39 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
40 "Untracked working tree file '%s' would be removed by merge.",
42 /* ERROR_BIND_OVERLAP */
43 "Entry '%s' overlaps with '%s'. Cannot bind.",
45 /* ERROR_SPARSE_NOT_UPTODATE_FILE */
46 "Entry '%s' not uptodate. Cannot update sparse checkout.",
48 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
49 "Working tree file '%s' would be overwritten by sparse checkout update.",
51 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
52 "Working tree file '%s' would be removed by sparse checkout update.",
54 /* ERROR_WOULD_LOSE_SUBMODULE */
55 "Submodule '%s' cannot checkout new HEAD.",
58 #define ERRORMSG(o,type) \
59 ( ((o) && (o)->msgs[(type)]) \
60 ? ((o)->msgs[(type)]) \
61 : (unpack_plumbing_errors[(type)]) )
63 static const char *super_prefixed(const char *path
)
66 * It is necessary and sufficient to have two static buffers
67 * here, as the return value of this function is fed to
68 * error() using the unpack_*_errors[] templates we see above.
70 static struct strbuf buf
[2] = {STRBUF_INIT
, STRBUF_INIT
};
71 static int super_prefix_len
= -1;
72 static unsigned idx
= ARRAY_SIZE(buf
) - 1;
74 if (super_prefix_len
< 0) {
75 const char *super_prefix
= get_super_prefix();
80 for (i
= 0; i
< ARRAY_SIZE(buf
); i
++)
81 strbuf_addstr(&buf
[i
], super_prefix
);
82 super_prefix_len
= buf
[0].len
;
86 if (!super_prefix_len
)
89 if (++idx
>= ARRAY_SIZE(buf
))
92 strbuf_setlen(&buf
[idx
], super_prefix_len
);
93 strbuf_addstr(&buf
[idx
], path
);
98 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
102 const char **msgs
= opts
->msgs
;
105 if (!strcmp(cmd
, "checkout"))
106 msg
= advice_commit_before_merge
107 ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
108 "Please commit your changes or stash them before you switch branches.")
109 : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
110 else if (!strcmp(cmd
, "merge"))
111 msg
= advice_commit_before_merge
112 ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
113 "Please commit your changes or stash them before you merge.")
114 : _("Your local changes to the following files would be overwritten by merge:\n%%s");
116 msg
= advice_commit_before_merge
117 ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
118 "Please commit your changes or stash them before you %s.")
119 : _("Your local changes to the following files would be overwritten by %s:\n%%s");
120 msgs
[ERROR_WOULD_OVERWRITE
] = msgs
[ERROR_NOT_UPTODATE_FILE
] =
121 xstrfmt(msg
, cmd
, cmd
);
123 msgs
[ERROR_NOT_UPTODATE_DIR
] =
124 _("Updating the following directories would lose untracked files in them:\n%s");
126 if (!strcmp(cmd
, "checkout"))
127 msg
= advice_commit_before_merge
128 ? _("The following untracked working tree files would be removed by checkout:\n%%s"
129 "Please move or remove them before you switch branches.")
130 : _("The following untracked working tree files would be removed by checkout:\n%%s");
131 else if (!strcmp(cmd
, "merge"))
132 msg
= advice_commit_before_merge
133 ? _("The following untracked working tree files would be removed by merge:\n%%s"
134 "Please move or remove them before you merge.")
135 : _("The following untracked working tree files would be removed by merge:\n%%s");
137 msg
= advice_commit_before_merge
138 ? _("The following untracked working tree files would be removed by %s:\n%%s"
139 "Please move or remove them before you %s.")
140 : _("The following untracked working tree files would be removed by %s:\n%%s");
141 msgs
[ERROR_WOULD_LOSE_UNTRACKED_REMOVED
] = xstrfmt(msg
, cmd
, cmd
);
143 if (!strcmp(cmd
, "checkout"))
144 msg
= advice_commit_before_merge
145 ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
146 "Please move or remove them before you switch branches.")
147 : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
148 else if (!strcmp(cmd
, "merge"))
149 msg
= advice_commit_before_merge
150 ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
151 "Please move or remove them before you merge.")
152 : _("The following untracked working tree files would be overwritten by merge:\n%%s");
154 msg
= advice_commit_before_merge
155 ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
156 "Please move or remove them before you %s.")
157 : _("The following untracked working tree files would be overwritten by %s:\n%%s");
158 msgs
[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
] = xstrfmt(msg
, cmd
, cmd
);
161 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
162 * cannot easily display it as a list.
164 msgs
[ERROR_BIND_OVERLAP
] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
166 msgs
[ERROR_SPARSE_NOT_UPTODATE_FILE
] =
167 _("Cannot update sparse checkout: the following entries are not up to date:\n%s");
168 msgs
[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
] =
169 _("The following working tree files would be overwritten by sparse checkout update:\n%s");
170 msgs
[ERROR_WOULD_LOSE_ORPHANED_REMOVED
] =
171 _("The following working tree files would be removed by sparse checkout update:\n%s");
172 msgs
[ERROR_WOULD_LOSE_SUBMODULE
] =
173 _("Cannot update submodule:\n%s");
175 opts
->show_all_errors
= 1;
176 /* rejected paths may not have a static buffer */
177 for (i
= 0; i
< ARRAY_SIZE(opts
->unpack_rejects
); i
++)
178 opts
->unpack_rejects
[i
].strdup_strings
= 1;
181 static int do_add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
182 unsigned int set
, unsigned int clear
)
189 ce
->ce_flags
= (ce
->ce_flags
& ~clear
) | set
;
190 return add_index_entry(&o
->result
, ce
,
191 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
194 static struct cache_entry
*dup_entry(const struct cache_entry
*ce
)
196 unsigned int size
= ce_size(ce
);
197 struct cache_entry
*new = xmalloc(size
);
199 memcpy(new, ce
, size
);
203 static void add_entry(struct unpack_trees_options
*o
,
204 const struct cache_entry
*ce
,
205 unsigned int set
, unsigned int clear
)
207 do_add_entry(o
, dup_entry(ce
), set
, clear
);
211 * add error messages on path <path>
212 * corresponding to the type <e> with the message <msg>
213 * indicating if it should be display in porcelain or not
215 static int add_rejected_path(struct unpack_trees_options
*o
,
216 enum unpack_trees_error_types e
,
219 if (!o
->show_all_errors
)
220 return error(ERRORMSG(o
, e
), super_prefixed(path
));
223 * Otherwise, insert in a list for future display by
224 * display_error_msgs()
226 string_list_append(&o
->unpack_rejects
[e
], path
);
231 * display all the error messages stored in a nice way
233 static void display_error_msgs(struct unpack_trees_options
*o
)
236 int something_displayed
= 0;
237 for (e
= 0; e
< NB_UNPACK_TREES_ERROR_TYPES
; e
++) {
238 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
239 if (rejects
->nr
> 0) {
240 struct strbuf path
= STRBUF_INIT
;
241 something_displayed
= 1;
242 for (i
= 0; i
< rejects
->nr
; i
++)
243 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
244 error(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
245 strbuf_release(&path
);
247 string_list_clear(rejects
, 0);
249 if (something_displayed
)
250 fprintf(stderr
, _("Aborting\n"));
253 static int check_submodule_move_head(const struct cache_entry
*ce
,
256 struct unpack_trees_options
*o
)
258 unsigned flags
= SUBMODULE_MOVE_HEAD_DRY_RUN
;
259 const struct submodule
*sub
= submodule_from_ce(ce
);
265 flags
|= SUBMODULE_MOVE_HEAD_FORCE
;
267 if (submodule_move_head(ce
->name
, old_id
, new_id
, flags
))
268 return o
->gently
? -1 :
269 add_rejected_path(o
, ERROR_WOULD_LOSE_SUBMODULE
, ce
->name
);
274 * Preform the loading of the repository's gitmodules file. This function is
275 * used by 'check_update()' to perform loading of the gitmodules file in two
276 * differnt situations:
277 * (1) before removing entries from the working tree if the gitmodules file has
278 * been marked for removal. This situation is specified by 'state' == NULL.
279 * (2) before checking out entries to the working tree if the gitmodules file
280 * has been marked for update. This situation is specified by 'state' != NULL.
282 static void load_gitmodules_file(struct index_state
*index
,
283 struct checkout
*state
)
285 int pos
= index_name_pos(index
, GITMODULES_FILE
, strlen(GITMODULES_FILE
));
288 struct cache_entry
*ce
= index
->cache
[pos
];
289 if (!state
&& ce
->ce_flags
& CE_WT_REMOVE
) {
290 repo_read_gitmodules(the_repository
);
291 } else if (state
&& (ce
->ce_flags
& CE_UPDATE
)) {
293 checkout_entry(ce
, state
, NULL
);
294 repo_read_gitmodules(the_repository
);
300 * Unlink the last component and schedule the leading directories for
301 * removal, such that empty directories get removed.
303 static void unlink_entry(const struct cache_entry
*ce
)
305 const struct submodule
*sub
= submodule_from_ce(ce
);
307 /* state.force is set at the caller. */
308 submodule_move_head(ce
->name
, "HEAD", NULL
,
309 SUBMODULE_MOVE_HEAD_FORCE
);
311 if (!check_leading_path(ce
->name
, ce_namelen(ce
)))
313 if (remove_or_warn(ce
->ce_mode
, ce
->name
))
315 schedule_dir_for_removal(ce
->name
, ce_namelen(ce
));
318 static struct progress
*get_progress(struct unpack_trees_options
*o
)
320 unsigned cnt
= 0, total
= 0;
321 struct index_state
*index
= &o
->result
;
323 if (!o
->update
|| !o
->verbose_update
)
326 for (; cnt
< index
->cache_nr
; cnt
++) {
327 const struct cache_entry
*ce
= index
->cache
[cnt
];
328 if (ce
->ce_flags
& (CE_UPDATE
| CE_WT_REMOVE
))
332 return start_delayed_progress(_("Checking out files"), total
);
335 static int check_updates(struct unpack_trees_options
*o
)
339 struct progress
*progress
= NULL
;
340 struct index_state
*index
= &o
->result
;
341 struct checkout state
= CHECKOUT_INIT
;
346 state
.refresh_cache
= 1;
347 state
.istate
= index
;
349 progress
= get_progress(o
);
352 git_attr_set_direction(GIT_ATTR_CHECKOUT
, index
);
354 if (should_update_submodules() && o
->update
&& !o
->dry_run
)
355 load_gitmodules_file(index
, NULL
);
357 for (i
= 0; i
< index
->cache_nr
; i
++) {
358 const struct cache_entry
*ce
= index
->cache
[i
];
360 if (ce
->ce_flags
& CE_WT_REMOVE
) {
361 display_progress(progress
, ++cnt
);
362 if (o
->update
&& !o
->dry_run
)
366 remove_marked_cache_entries(index
);
367 remove_scheduled_dirs();
369 if (should_update_submodules() && o
->update
&& !o
->dry_run
)
370 load_gitmodules_file(index
, &state
);
372 enable_delayed_checkout(&state
);
373 if (repository_format_partial_clone
&& o
->update
&& !o
->dry_run
) {
375 * Prefetch the objects that are to be checked out in the loop
378 struct oid_array to_fetch
= OID_ARRAY_INIT
;
379 int fetch_if_missing_store
= fetch_if_missing
;
380 fetch_if_missing
= 0;
381 for (i
= 0; i
< index
->cache_nr
; i
++) {
382 struct cache_entry
*ce
= index
->cache
[i
];
383 if ((ce
->ce_flags
& CE_UPDATE
) &&
384 !S_ISGITLINK(ce
->ce_mode
)) {
385 if (!has_object_file(&ce
->oid
))
386 oid_array_append(&to_fetch
, &ce
->oid
);
390 fetch_objects(repository_format_partial_clone
,
392 fetch_if_missing
= fetch_if_missing_store
;
394 for (i
= 0; i
< index
->cache_nr
; i
++) {
395 struct cache_entry
*ce
= index
->cache
[i
];
397 if (ce
->ce_flags
& CE_UPDATE
) {
398 if (ce
->ce_flags
& CE_WT_REMOVE
)
399 die("BUG: both update and delete flags are set on %s",
401 display_progress(progress
, ++cnt
);
402 ce
->ce_flags
&= ~CE_UPDATE
;
403 if (o
->update
&& !o
->dry_run
) {
404 errs
|= checkout_entry(ce
, &state
, NULL
);
408 stop_progress(&progress
);
409 errs
|= finish_delayed_checkout(&state
);
411 git_attr_set_direction(GIT_ATTR_CHECKIN
, NULL
);
415 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
416 struct unpack_trees_options
*o
);
417 static int verify_absent_sparse(const struct cache_entry
*ce
,
418 enum unpack_trees_error_types
,
419 struct unpack_trees_options
*o
);
421 static int apply_sparse_checkout(struct index_state
*istate
,
422 struct cache_entry
*ce
,
423 struct unpack_trees_options
*o
)
425 int was_skip_worktree
= ce_skip_worktree(ce
);
427 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
428 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
430 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
431 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
432 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
433 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
437 * if (!was_skip_worktree && !ce_skip_worktree()) {
438 * This is perfectly normal. Move on;
443 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
444 * area as a result of ce_skip_worktree() shortcuts in
445 * verify_absent() and verify_uptodate().
446 * Make sure they don't modify worktree if they are already
447 * outside checkout area
449 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
450 ce
->ce_flags
&= ~CE_UPDATE
;
453 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
454 * on to get that file removed from both index and worktree.
455 * If that file is already outside worktree area, don't
458 if (ce
->ce_flags
& CE_REMOVE
)
459 ce
->ce_flags
&= ~CE_WT_REMOVE
;
462 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
464 * If CE_UPDATE is set, verify_uptodate() must be called already
465 * also stat info may have lost after merged_entry() so calling
466 * verify_uptodate() again may fail
468 if (!(ce
->ce_flags
& CE_UPDATE
) && verify_uptodate_sparse(ce
, o
))
470 ce
->ce_flags
|= CE_WT_REMOVE
;
471 ce
->ce_flags
&= ~CE_UPDATE
;
473 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
474 if (verify_absent_sparse(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
))
476 ce
->ce_flags
|= CE_UPDATE
;
481 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
482 struct unpack_trees_options
*o
)
484 int ret
= o
->fn(src
, o
);
490 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
492 ce
->ce_flags
|= CE_UNPACKED
;
494 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
495 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
496 int bottom
= o
->cache_bottom
;
497 while (bottom
< o
->src_index
->cache_nr
&&
498 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
500 o
->cache_bottom
= bottom
;
504 static void mark_all_ce_unused(struct index_state
*index
)
507 for (i
= 0; i
< index
->cache_nr
; i
++)
508 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
511 static int locate_in_src_index(const struct cache_entry
*ce
,
512 struct unpack_trees_options
*o
)
514 struct index_state
*index
= o
->src_index
;
515 int len
= ce_namelen(ce
);
516 int pos
= index_name_pos(index
, ce
->name
, len
);
523 * We call unpack_index_entry() with an unmerged cache entry
524 * only in diff-index, and it wants a single callback. Skip
525 * the other unmerged entry with the same name.
527 static void mark_ce_used_same_name(struct cache_entry
*ce
,
528 struct unpack_trees_options
*o
)
530 struct index_state
*index
= o
->src_index
;
531 int len
= ce_namelen(ce
);
534 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
535 struct cache_entry
*next
= index
->cache
[pos
];
536 if (len
!= ce_namelen(next
) ||
537 memcmp(ce
->name
, next
->name
, len
))
539 mark_ce_used(next
, o
);
543 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
545 const struct index_state
*index
= o
->src_index
;
546 int pos
= o
->cache_bottom
;
548 while (pos
< index
->cache_nr
) {
549 struct cache_entry
*ce
= index
->cache
[pos
];
550 if (!(ce
->ce_flags
& CE_UNPACKED
))
557 static void add_same_unmerged(const struct cache_entry
*ce
,
558 struct unpack_trees_options
*o
)
560 struct index_state
*index
= o
->src_index
;
561 int len
= ce_namelen(ce
);
562 int pos
= index_name_pos(index
, ce
->name
, len
);
565 die("programming error in a caller of mark_ce_used_same_name");
566 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
567 struct cache_entry
*next
= index
->cache
[pos
];
568 if (len
!= ce_namelen(next
) ||
569 memcmp(ce
->name
, next
->name
, len
))
571 add_entry(o
, next
, 0, 0);
572 mark_ce_used(next
, o
);
576 static int unpack_index_entry(struct cache_entry
*ce
,
577 struct unpack_trees_options
*o
)
579 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
586 if (o
->skip_unmerged
) {
587 add_entry(o
, ce
, 0, 0);
591 ret
= call_unpack_fn(src
, o
);
593 mark_ce_used_same_name(ce
, o
);
597 static int find_cache_pos(struct traverse_info
*, const struct name_entry
*);
599 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
601 struct unpack_trees_options
*o
= info
->data
;
603 if (o
->diff_index_cached
)
605 o
->cache_bottom
= bottom
;
608 static int switch_cache_bottom(struct traverse_info
*info
)
610 struct unpack_trees_options
*o
= info
->data
;
613 if (o
->diff_index_cached
)
615 ret
= o
->cache_bottom
;
616 pos
= find_cache_pos(info
->prev
, &info
->name
);
619 o
->cache_bottom
= -2 - pos
;
621 o
->cache_bottom
= o
->src_index
->cache_nr
;
625 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
627 return name_j
->oid
&& name_k
->oid
&& !oidcmp(name_j
->oid
, name_k
->oid
);
630 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
631 unsigned long df_conflicts
,
632 struct name_entry
*names
,
633 struct traverse_info
*info
)
637 struct tree_desc t
[MAX_UNPACK_TREES
];
638 void *buf
[MAX_UNPACK_TREES
];
639 struct traverse_info newinfo
;
640 struct name_entry
*p
;
648 newinfo
.pathspec
= info
->pathspec
;
650 newinfo
.pathlen
+= tree_entry_len(p
) + 1;
651 newinfo
.df_conflicts
|= df_conflicts
;
654 * Fetch the tree from the ODB for each peer directory in the
657 * For 2- and 3-way traversals, we try to avoid hitting the
658 * ODB twice for the same OID. This should yield a nice speed
659 * up in checkouts and merges when the commits are similar.
661 * We don't bother doing the full O(n^2) search for larger n,
662 * because wider traversals don't happen that often and we
663 * avoid the search setup.
665 * When 2 peer OIDs are the same, we just copy the tree
666 * descriptor data. This implicitly borrows the buffer
667 * data from the earlier cell.
669 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
670 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
672 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
675 const struct object_id
*oid
= NULL
;
678 buf
[nr_buf
++] = fill_tree_descriptor(t
+ i
, oid
);
682 bottom
= switch_cache_bottom(&newinfo
);
683 ret
= traverse_trees(n
, t
, &newinfo
);
684 restore_cache_bottom(&newinfo
, bottom
);
686 for (i
= 0; i
< nr_buf
; i
++)
693 * Compare the traverse-path to the cache entry without actually
694 * having to generate the textual representation of the traverse
697 * NOTE! This *only* compares up to the size of the traverse path
698 * itself - the caller needs to do the final check for the cache
699 * entry having more data at the end!
701 static int do_compare_entry_piecewise(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
703 int len
, pathlen
, ce_len
;
707 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
712 pathlen
= info
->pathlen
;
713 ce_len
= ce_namelen(ce
);
715 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
716 if (ce_len
< pathlen
)
720 ce_name
= ce
->name
+ pathlen
;
722 len
= tree_entry_len(n
);
723 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
726 static int do_compare_entry(const struct cache_entry
*ce
,
727 const struct traverse_info
*info
,
728 const struct name_entry
*n
)
730 int len
, pathlen
, ce_len
;
735 * If we have not precomputed the traverse path, it is quicker
736 * to avoid doing so. But if we have precomputed it,
737 * it is quicker to use the precomputed version.
739 if (!info
->traverse_path
)
740 return do_compare_entry_piecewise(ce
, info
, n
);
742 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
746 pathlen
= info
->pathlen
;
747 ce_len
= ce_namelen(ce
);
749 if (ce_len
< pathlen
)
753 ce_name
= ce
->name
+ pathlen
;
755 len
= tree_entry_len(n
);
756 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
759 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
761 int cmp
= do_compare_entry(ce
, info
, n
);
766 * Even if the beginning compared identically, the ce should
767 * compare as bigger than a directory leading up to it!
769 return ce_namelen(ce
) > traverse_path_len(info
, n
);
772 static int ce_in_traverse_path(const struct cache_entry
*ce
,
773 const struct traverse_info
*info
)
777 if (do_compare_entry(ce
, info
->prev
, &info
->name
))
780 * If ce (blob) is the same name as the path (which is a tree
781 * we will be descending into), it won't be inside it.
783 return (info
->pathlen
< ce_namelen(ce
));
786 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
, const struct name_entry
*n
, int stage
)
788 int len
= traverse_path_len(info
, n
);
789 struct cache_entry
*ce
= xcalloc(1, cache_entry_size(len
));
791 ce
->ce_mode
= create_ce_mode(n
->mode
);
792 ce
->ce_flags
= create_ce_flags(stage
);
793 ce
->ce_namelen
= len
;
794 oidcpy(&ce
->oid
, n
->oid
);
795 make_traverse_path(ce
->name
, info
, n
);
800 static int unpack_nondirectories(int n
, unsigned long mask
,
801 unsigned long dirmask
,
802 struct cache_entry
**src
,
803 const struct name_entry
*names
,
804 const struct traverse_info
*info
)
807 struct unpack_trees_options
*o
= info
->data
;
808 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
810 /* Do we have *only* directories? Nothing to do */
811 if (mask
== dirmask
&& !src
[0])
815 * Ok, we've filled in up to any potential index entry in src[0],
818 for (i
= 0; i
< n
; i
++) {
820 unsigned int bit
= 1ul << i
;
821 if (conflicts
& bit
) {
822 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
829 else if (i
+ 1 < o
->head_idx
)
831 else if (i
+ 1 > o
->head_idx
)
835 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
);
839 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
841 for (i
= 0; i
< n
; i
++) {
842 struct cache_entry
*ce
= src
[i
+ o
->merge
];
843 if (ce
!= o
->df_conflict_entry
)
849 for (i
= 0; i
< n
; i
++)
850 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
851 if (do_add_entry(o
, src
[i
], 0, 0))
857 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
859 discard_index(&o
->result
);
860 if (!o
->gently
&& !o
->exiting_early
) {
862 return error("%s", message
);
869 * The tree traversal is looking at name p. If we have a matching entry,
870 * return it. If name p is a directory in the index, do not return
871 * anything, as we will want to match it when the traversal descends into
874 static int find_cache_pos(struct traverse_info
*info
,
875 const struct name_entry
*p
)
878 struct unpack_trees_options
*o
= info
->data
;
879 struct index_state
*index
= o
->src_index
;
880 int pfxlen
= info
->pathlen
;
881 int p_len
= tree_entry_len(p
);
883 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
884 const struct cache_entry
*ce
= index
->cache
[pos
];
885 const char *ce_name
, *ce_slash
;
888 if (ce
->ce_flags
& CE_UNPACKED
) {
890 * cache_bottom entry is already unpacked, so
891 * we can never match it; don't check it
894 if (pos
== o
->cache_bottom
)
898 if (!ce_in_traverse_path(ce
, info
)) {
900 * Check if we can skip future cache checks
901 * (because we're already past all possible
902 * entries in the traverse path).
904 if (info
->traverse_path
) {
905 if (strncmp(ce
->name
, info
->traverse_path
,
911 ce_name
= ce
->name
+ pfxlen
;
912 ce_slash
= strchr(ce_name
, '/');
914 ce_len
= ce_slash
- ce_name
;
916 ce_len
= ce_namelen(ce
) - pfxlen
;
917 cmp
= name_compare(p
->path
, p_len
, ce_name
, ce_len
);
919 * Exact match; if we have a directory we need to
920 * delay returning it.
923 return ce_slash
? -2 - pos
: pos
;
925 continue; /* keep looking */
927 * ce_name sorts after p->path; could it be that we
928 * have files under p->path directory in the index?
929 * E.g. ce_name == "t-i", and p->path == "t"; we may
930 * have "t/a" in the index.
932 if (p_len
< ce_len
&& !memcmp(ce_name
, p
->path
, p_len
) &&
933 ce_name
[p_len
] < '/')
934 continue; /* keep looking */
940 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
941 const struct name_entry
*p
)
943 int pos
= find_cache_pos(info
, p
);
944 struct unpack_trees_options
*o
= info
->data
;
947 return o
->src_index
->cache
[pos
];
952 static void debug_path(struct traverse_info
*info
)
955 debug_path(info
->prev
);
956 if (*info
->prev
->name
.path
)
959 printf("%s", info
->name
.path
);
962 static void debug_name_entry(int i
, struct name_entry
*n
)
964 printf("ent#%d %06o %s\n", i
,
965 n
->path
? n
->mode
: 0,
966 n
->path
? n
->path
: "(missing)");
969 static void debug_unpack_callback(int n
,
971 unsigned long dirmask
,
972 struct name_entry
*names
,
973 struct traverse_info
*info
)
976 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
980 for (i
= 0; i
< n
; i
++)
981 debug_name_entry(i
, names
+ i
);
984 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
986 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
987 struct unpack_trees_options
*o
= info
->data
;
988 const struct name_entry
*p
= names
;
990 /* Find first entry with a real name (we could use "mask" too) */
995 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
997 /* Are we supposed to look at the index too? */
1001 struct cache_entry
*ce
;
1003 if (o
->diff_index_cached
)
1004 ce
= next_cache_entry(o
);
1006 ce
= find_cache_entry(info
, p
);
1010 cmp
= compare_entry(ce
, info
, p
);
1012 if (unpack_index_entry(ce
, o
) < 0)
1013 return unpack_failed(o
, NULL
);
1019 * If we skip unmerged index
1020 * entries, we'll skip this
1021 * entry *and* the tree
1022 * entries associated with it!
1024 if (o
->skip_unmerged
) {
1025 add_same_unmerged(ce
, o
);
1035 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
1038 if (o
->merge
&& src
[0]) {
1039 if (ce_stage(src
[0]))
1040 mark_ce_used_same_name(src
[0], o
);
1042 mark_ce_used(src
[0], o
);
1045 /* Now handle any directories.. */
1047 /* special case: "diff-index --cached" looking at a tree */
1048 if (o
->diff_index_cached
&&
1049 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1051 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1054 * Everything under the name matches; skip the
1055 * entire hierarchy. diff_index_cached codepath
1056 * special cases D/F conflicts in such a way that
1057 * it does not do any look-ahead, so this is safe.
1060 o
->cache_bottom
+= matches
;
1065 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1074 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1075 struct strbuf
*prefix
,
1076 int select_mask
, int clear_mask
,
1077 struct exclude_list
*el
, int defval
);
1079 /* Whole directory matching */
1080 static int clear_ce_flags_dir(struct cache_entry
**cache
, int nr
,
1081 struct strbuf
*prefix
,
1083 int select_mask
, int clear_mask
,
1084 struct exclude_list
*el
, int defval
)
1086 struct cache_entry
**cache_end
;
1088 int ret
= is_excluded_from_list(prefix
->buf
, prefix
->len
,
1089 basename
, &dtype
, el
, &the_index
);
1092 strbuf_addch(prefix
, '/');
1094 /* If undecided, use matching result of parent dir in defval */
1098 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1099 struct cache_entry
*ce
= *cache_end
;
1100 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1105 * TODO: check el, if there are no patterns that may conflict
1106 * with ret (iow, we know in advance the incl/excl
1107 * decision for the entire directory), clear flag here without
1108 * calling clear_ce_flags_1(). That function will call
1109 * the expensive is_excluded_from_list() on every entry.
1111 rc
= clear_ce_flags_1(cache
, cache_end
- cache
,
1113 select_mask
, clear_mask
,
1115 strbuf_setlen(prefix
, prefix
->len
- 1);
1120 * Traverse the index, find every entry that matches according to
1121 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
1122 * number of traversed entries.
1124 * If select_mask is non-zero, only entries whose ce_flags has on of
1125 * those bits enabled are traversed.
1127 * cache : pointer to an index entry
1128 * prefix_len : an offset to its path
1130 * The current path ("prefix") including the trailing '/' is
1131 * cache[0]->name[0..(prefix_len-1)]
1132 * Top level path has prefix_len zero.
1134 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1135 struct strbuf
*prefix
,
1136 int select_mask
, int clear_mask
,
1137 struct exclude_list
*el
, int defval
)
1139 struct cache_entry
**cache_end
= cache
+ nr
;
1142 * Process all entries that have the given prefix and meet
1143 * select_mask condition
1145 while(cache
!= cache_end
) {
1146 struct cache_entry
*ce
= *cache
;
1147 const char *name
, *slash
;
1148 int len
, dtype
, ret
;
1150 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1155 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1158 name
= ce
->name
+ prefix
->len
;
1159 slash
= strchr(name
, '/');
1161 /* If it's a directory, try whole directory match first */
1166 strbuf_add(prefix
, name
, len
);
1168 processed
= clear_ce_flags_dir(cache
, cache_end
- cache
,
1170 prefix
->buf
+ prefix
->len
- len
,
1171 select_mask
, clear_mask
,
1174 /* clear_c_f_dir eats a whole dir already? */
1177 strbuf_setlen(prefix
, prefix
->len
- len
);
1181 strbuf_addch(prefix
, '/');
1182 cache
+= clear_ce_flags_1(cache
, cache_end
- cache
,
1184 select_mask
, clear_mask
, el
, defval
);
1185 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1190 dtype
= ce_to_dtype(ce
);
1191 ret
= is_excluded_from_list(ce
->name
, ce_namelen(ce
),
1192 name
, &dtype
, el
, &the_index
);
1196 ce
->ce_flags
&= ~clear_mask
;
1199 return nr
- (cache_end
- cache
);
1202 static int clear_ce_flags(struct cache_entry
**cache
, int nr
,
1203 int select_mask
, int clear_mask
,
1204 struct exclude_list
*el
)
1206 static struct strbuf prefix
= STRBUF_INIT
;
1208 strbuf_reset(&prefix
);
1210 return clear_ce_flags_1(cache
, nr
,
1212 select_mask
, clear_mask
,
1217 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1219 static void mark_new_skip_worktree(struct exclude_list
*el
,
1220 struct index_state
*the_index
,
1221 int select_flag
, int skip_wt_flag
)
1226 * 1. Pretend the narrowest worktree: only unmerged entries
1229 for (i
= 0; i
< the_index
->cache_nr
; i
++) {
1230 struct cache_entry
*ce
= the_index
->cache
[i
];
1232 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1236 ce
->ce_flags
|= skip_wt_flag
;
1238 ce
->ce_flags
&= ~skip_wt_flag
;
1242 * 2. Widen worktree according to sparse-checkout file.
1243 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1245 clear_ce_flags(the_index
->cache
, the_index
->cache_nr
,
1246 select_flag
, skip_wt_flag
, el
);
1249 static int verify_absent(const struct cache_entry
*,
1250 enum unpack_trees_error_types
,
1251 struct unpack_trees_options
*);
1253 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1254 * resulting index, -2 on failure to reflect the changes to the work tree.
1256 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1258 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1261 static struct cache_entry
*dfc
;
1262 struct exclude_list el
;
1264 if (len
> MAX_UNPACK_TREES
)
1265 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1267 memset(&el
, 0, sizeof(el
));
1268 if (!core_apply_sparse_checkout
|| !o
->update
)
1269 o
->skip_sparse_checkout
= 1;
1270 if (!o
->skip_sparse_checkout
) {
1271 char *sparse
= git_pathdup("info/sparse-checkout");
1272 if (add_excludes_from_file_to_list(sparse
, "", 0, &el
, NULL
) < 0)
1273 o
->skip_sparse_checkout
= 1;
1279 memset(&o
->result
, 0, sizeof(o
->result
));
1280 o
->result
.initialized
= 1;
1281 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1282 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1283 o
->result
.version
= o
->src_index
->version
;
1284 o
->result
.split_index
= o
->src_index
->split_index
;
1285 if (o
->result
.split_index
)
1286 o
->result
.split_index
->refcount
++;
1287 hashcpy(o
->result
.sha1
, o
->src_index
->sha1
);
1288 o
->merge_size
= len
;
1289 mark_all_ce_unused(o
->src_index
);
1292 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1294 if (!o
->skip_sparse_checkout
)
1295 mark_new_skip_worktree(o
->el
, o
->src_index
, 0, CE_NEW_SKIP_WORKTREE
);
1298 dfc
= xcalloc(1, cache_entry_size(0));
1299 o
->df_conflict_entry
= dfc
;
1302 const char *prefix
= o
->prefix
? o
->prefix
: "";
1303 struct traverse_info info
;
1305 setup_traverse_info(&info
, prefix
);
1306 info
.fn
= unpack_callback
;
1308 info
.show_all_errors
= o
->show_all_errors
;
1309 info
.pathspec
= o
->pathspec
;
1313 * Unpack existing index entries that sort before the
1314 * prefix the tree is spliced into. Note that o->merge
1315 * is always true in this case.
1318 struct cache_entry
*ce
= next_cache_entry(o
);
1321 if (ce_in_traverse_path(ce
, &info
))
1323 if (unpack_index_entry(ce
, o
) < 0)
1328 if (traverse_trees(len
, t
, &info
) < 0)
1332 /* Any left-over entries in the index? */
1335 struct cache_entry
*ce
= next_cache_entry(o
);
1338 if (unpack_index_entry(ce
, o
) < 0)
1342 mark_all_ce_unused(o
->src_index
);
1344 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1345 ret
= unpack_failed(o
, "Merge requires file-level merging");
1349 if (!o
->skip_sparse_checkout
) {
1350 int empty_worktree
= 1;
1353 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1354 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1355 * so apply_sparse_checkout() won't attempt to remove it from worktree
1357 mark_new_skip_worktree(o
->el
, &o
->result
, CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1360 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1361 struct cache_entry
*ce
= o
->result
.cache
[i
];
1364 * Entries marked with CE_ADDED in merged_entry() do not have
1365 * verify_absent() check (the check is effectively disabled
1366 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1368 * Do the real check now because we have had
1369 * correct CE_NEW_SKIP_WORKTREE
1371 if (ce
->ce_flags
& CE_ADDED
&&
1372 verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1373 if (!o
->show_all_errors
)
1378 if (apply_sparse_checkout(&o
->result
, ce
, o
)) {
1379 if (!o
->show_all_errors
)
1383 if (!ce_skip_worktree(ce
))
1390 * Sparse checkout is meant to narrow down checkout area
1391 * but it does not make sense to narrow down to empty working
1392 * tree. This is usually a mistake in sparse checkout rules.
1393 * Do not allow users to do that.
1395 if (o
->result
.cache_nr
&& empty_worktree
) {
1396 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1401 o
->src_index
= NULL
;
1402 ret
= check_updates(o
) ? (-2) : 0;
1405 if (!o
->result
.cache_tree
)
1406 o
->result
.cache_tree
= cache_tree();
1407 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1408 cache_tree_update(&o
->result
,
1412 move_index_extensions(&o
->result
, o
->dst_index
);
1413 discard_index(o
->dst_index
);
1414 *o
->dst_index
= o
->result
;
1416 discard_index(&o
->result
);
1420 clear_exclude_list(&el
);
1424 if (o
->show_all_errors
)
1425 display_error_msgs(o
);
1426 mark_all_ce_unused(o
->src_index
);
1427 ret
= unpack_failed(o
, NULL
);
1428 if (o
->exiting_early
)
1433 /* Here come the merge functions */
1435 static int reject_merge(const struct cache_entry
*ce
,
1436 struct unpack_trees_options
*o
)
1438 return o
->gently
? -1 :
1439 add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1442 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1448 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1450 return a
->ce_mode
== b
->ce_mode
&&
1451 !oidcmp(&a
->oid
, &b
->oid
);
1456 * When a CE gets turned into an unmerged entry, we
1457 * want it to be up-to-date
1459 static int verify_uptodate_1(const struct cache_entry
*ce
,
1460 struct unpack_trees_options
*o
,
1461 enum unpack_trees_error_types error_type
)
1469 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1470 * if this entry is truly up-to-date because this file may be
1473 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1474 ; /* keep checking */
1475 else if (o
->reset
|| ce_uptodate(ce
))
1478 if (!lstat(ce
->name
, &st
)) {
1479 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1480 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1482 if (submodule_from_ce(ce
)) {
1483 int r
= check_submodule_move_head(ce
,
1484 "HEAD", oid_to_hex(&ce
->oid
), o
);
1486 return o
->gently
? -1 :
1487 add_rejected_path(o
, error_type
, ce
->name
);
1494 * Historic default policy was to allow submodule to be out
1495 * of sync wrt the superproject index. If the submodule was
1496 * not considered interesting above, we don't care here.
1498 if (S_ISGITLINK(ce
->ce_mode
))
1503 if (errno
== ENOENT
)
1505 return o
->gently
? -1 :
1506 add_rejected_path(o
, error_type
, ce
->name
);
1509 static int verify_uptodate(const struct cache_entry
*ce
,
1510 struct unpack_trees_options
*o
)
1512 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1514 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1517 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1518 struct unpack_trees_options
*o
)
1520 return verify_uptodate_1(ce
, o
, ERROR_SPARSE_NOT_UPTODATE_FILE
);
1523 static void invalidate_ce_path(const struct cache_entry
*ce
,
1524 struct unpack_trees_options
*o
)
1528 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1529 untracked_cache_invalidate_path(o
->src_index
, ce
->name
);
1533 * Check that checking out ce->sha1 in subdir ce->name is not
1534 * going to overwrite any working files.
1536 * Currently, git does not checkout subprojects during a superproject
1537 * checkout, so it is not going to overwrite anything.
1539 static int verify_clean_submodule(const char *old_sha1
,
1540 const struct cache_entry
*ce
,
1541 enum unpack_trees_error_types error_type
,
1542 struct unpack_trees_options
*o
)
1544 if (!submodule_from_ce(ce
))
1547 return check_submodule_move_head(ce
, old_sha1
,
1548 oid_to_hex(&ce
->oid
), o
);
1551 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1552 enum unpack_trees_error_types error_type
,
1553 struct unpack_trees_options
*o
)
1556 * we are about to extract "ce->name"; we would not want to lose
1557 * anything in the existing directory there.
1561 struct dir_struct d
;
1565 if (S_ISGITLINK(ce
->ce_mode
)) {
1566 unsigned char sha1
[20];
1567 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", sha1
);
1569 * If we are not going to update the submodule, then
1572 if (!sub_head
&& !hashcmp(sha1
, ce
->oid
.hash
))
1574 return verify_clean_submodule(sub_head
? NULL
: sha1_to_hex(sha1
),
1579 * First let's make sure we do not have a local modification
1580 * in that directory.
1582 namelen
= ce_namelen(ce
);
1583 for (i
= locate_in_src_index(ce
, o
);
1584 i
< o
->src_index
->cache_nr
;
1586 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1587 int len
= ce_namelen(ce2
);
1588 if (len
< namelen
||
1589 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1590 ce2
->name
[namelen
] != '/')
1593 * ce2->name is an entry in the subdirectory to be
1596 if (!ce_stage(ce2
)) {
1597 if (verify_uptodate(ce2
, o
))
1599 add_entry(o
, ce2
, CE_REMOVE
, 0);
1600 mark_ce_used(ce2
, o
);
1606 * Then we need to make sure that we do not lose a locally
1607 * present file that is not ignored.
1609 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
1611 memset(&d
, 0, sizeof(d
));
1613 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
1614 i
= read_directory(&d
, &the_index
, pathbuf
, namelen
+1, NULL
);
1616 return o
->gently
? -1 :
1617 add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
1623 * This gets called when there was no index entry for the tree entry 'dst',
1624 * but we found a file in the working tree that 'lstat()' said was fine,
1625 * and we're on a case-insensitive filesystem.
1627 * See if we can find a case-insensitive match in the index that also
1628 * matches the stat information, and assume it's that other file!
1630 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
1632 const struct cache_entry
*src
;
1634 src
= index_file_exists(o
->src_index
, name
, len
, 1);
1635 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
1638 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
1639 const struct cache_entry
*ce
, struct stat
*st
,
1640 enum unpack_trees_error_types error_type
,
1641 struct unpack_trees_options
*o
)
1643 const struct cache_entry
*result
;
1646 * It may be that the 'lstat()' succeeded even though
1647 * target 'ce' was absent, because there is an old
1648 * entry that is different only in case..
1650 * Ignore that lstat() if it matches.
1652 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
1656 is_excluded(o
->dir
, &the_index
, name
, &dtype
))
1658 * ce->name is explicitly excluded, so it is Ok to
1662 if (S_ISDIR(st
->st_mode
)) {
1664 * We are checking out path "foo" and
1665 * found "foo/." in the working tree.
1666 * This is tricky -- if we have modified
1667 * files that are in "foo/" we would lose
1670 if (verify_clean_subdirectory(ce
, error_type
, o
) < 0)
1676 * The previous round may already have decided to
1677 * delete this path, which is in a subdirectory that
1678 * is being replaced with a blob.
1680 result
= index_file_exists(&o
->result
, name
, len
, 0);
1682 if (result
->ce_flags
& CE_REMOVE
)
1686 return o
->gently
? -1 :
1687 add_rejected_path(o
, error_type
, name
);
1691 * We do not want to remove or overwrite a working tree file that
1692 * is not tracked, unless it is ignored.
1694 static int verify_absent_1(const struct cache_entry
*ce
,
1695 enum unpack_trees_error_types error_type
,
1696 struct unpack_trees_options
*o
)
1701 if (o
->index_only
|| o
->reset
|| !o
->update
)
1704 len
= check_leading_path(ce
->name
, ce_namelen(ce
));
1711 path
= xmemdupz(ce
->name
, len
);
1712 if (lstat(path
, &st
))
1713 ret
= error_errno("cannot stat '%s'", path
);
1715 if (submodule_from_ce(ce
))
1716 ret
= check_submodule_move_head(ce
,
1717 oid_to_hex(&ce
->oid
),
1720 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
1721 &st
, error_type
, o
);
1725 } else if (lstat(ce
->name
, &st
)) {
1726 if (errno
!= ENOENT
)
1727 return error_errno("cannot stat '%s'", ce
->name
);
1730 if (submodule_from_ce(ce
))
1731 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
1734 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
1735 ce_to_dtype(ce
), ce
, &st
,
1740 static int verify_absent(const struct cache_entry
*ce
,
1741 enum unpack_trees_error_types error_type
,
1742 struct unpack_trees_options
*o
)
1744 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1746 return verify_absent_1(ce
, error_type
, o
);
1749 static int verify_absent_sparse(const struct cache_entry
*ce
,
1750 enum unpack_trees_error_types error_type
,
1751 struct unpack_trees_options
*o
)
1753 enum unpack_trees_error_types orphaned_error
= error_type
;
1754 if (orphaned_error
== ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
)
1755 orphaned_error
= ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
;
1757 return verify_absent_1(ce
, orphaned_error
, o
);
1760 static int merged_entry(const struct cache_entry
*ce
,
1761 const struct cache_entry
*old
,
1762 struct unpack_trees_options
*o
)
1764 int update
= CE_UPDATE
;
1765 struct cache_entry
*merge
= dup_entry(ce
);
1769 * New index entries. In sparse checkout, the following
1770 * verify_absent() will be delayed until after
1771 * traverse_trees() finishes in unpack_trees(), then:
1773 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1774 * - verify_absent() be called again, this time with
1775 * correct CE_NEW_SKIP_WORKTREE
1777 * verify_absent() call here does nothing in sparse
1778 * checkout (i.e. o->skip_sparse_checkout == 0)
1781 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
1783 if (verify_absent(merge
,
1784 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1788 invalidate_ce_path(merge
, o
);
1790 if (submodule_from_ce(ce
)) {
1791 int ret
= check_submodule_move_head(ce
, NULL
,
1792 oid_to_hex(&ce
->oid
),
1798 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
1800 * See if we can re-use the old CE directly?
1801 * That way we get the uptodate stat info.
1803 * This also removes the UPDATE flag on a match; otherwise
1804 * we will end up overwriting local changes in the work tree.
1806 if (same(old
, merge
)) {
1807 copy_cache_entry(merge
, old
);
1810 if (verify_uptodate(old
, o
)) {
1814 /* Migrate old flags over */
1815 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1816 invalidate_ce_path(old
, o
);
1819 if (submodule_from_ce(ce
)) {
1820 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
1821 oid_to_hex(&ce
->oid
),
1828 * Previously unmerged entry left as an existence
1829 * marker by read_index_unmerged();
1831 invalidate_ce_path(old
, o
);
1834 do_add_entry(o
, merge
, update
, CE_STAGEMASK
);
1838 static int deleted_entry(const struct cache_entry
*ce
,
1839 const struct cache_entry
*old
,
1840 struct unpack_trees_options
*o
)
1842 /* Did it exist in the index? */
1844 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1848 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
1850 add_entry(o
, ce
, CE_REMOVE
, 0);
1851 invalidate_ce_path(ce
, o
);
1855 static int keep_entry(const struct cache_entry
*ce
,
1856 struct unpack_trees_options
*o
)
1858 add_entry(o
, ce
, 0, 0);
1863 static void show_stage_entry(FILE *o
,
1864 const char *label
, const struct cache_entry
*ce
)
1867 fprintf(o
, "%s (missing)\n", label
);
1869 fprintf(o
, "%s%06o %s %d\t%s\n",
1872 oid_to_hex(&ce
->oid
),
1878 int threeway_merge(const struct cache_entry
* const *stages
,
1879 struct unpack_trees_options
*o
)
1881 const struct cache_entry
*index
;
1882 const struct cache_entry
*head
;
1883 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
1886 int remote_match
= 0;
1888 int df_conflict_head
= 0;
1889 int df_conflict_remote
= 0;
1891 int any_anc_missing
= 0;
1892 int no_anc_exists
= 1;
1895 for (i
= 1; i
< o
->head_idx
; i
++) {
1896 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
1897 any_anc_missing
= 1;
1903 head
= stages
[o
->head_idx
];
1905 if (head
== o
->df_conflict_entry
) {
1906 df_conflict_head
= 1;
1910 if (remote
== o
->df_conflict_entry
) {
1911 df_conflict_remote
= 1;
1916 * First, if there's a #16 situation, note that to prevent #13
1919 if (!same(remote
, head
)) {
1920 for (i
= 1; i
< o
->head_idx
; i
++) {
1921 if (same(stages
[i
], head
)) {
1924 if (same(stages
[i
], remote
)) {
1931 * We start with cases where the index is allowed to match
1932 * something other than the head: #14(ALT) and #2ALT, where it
1933 * is permitted to match the result instead.
1935 /* #14, #14ALT, #2ALT */
1936 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
1937 if (index
&& !same(index
, remote
) && !same(index
, head
))
1938 return reject_merge(index
, o
);
1939 return merged_entry(remote
, index
, o
);
1942 * If we have an entry in the index cache, then we want to
1943 * make sure that it matches head.
1945 if (index
&& !same(index
, head
))
1946 return reject_merge(index
, o
);
1950 if (same(head
, remote
))
1951 return merged_entry(head
, index
, o
);
1953 if (!df_conflict_remote
&& remote_match
&& !head_match
)
1954 return merged_entry(head
, index
, o
);
1958 if (!head
&& !remote
&& any_anc_missing
)
1962 * Under the "aggressive" rule, we resolve mostly trivial
1963 * cases that we historically had git-merge-one-file resolve.
1965 if (o
->aggressive
) {
1966 int head_deleted
= !head
;
1967 int remote_deleted
= !remote
;
1968 const struct cache_entry
*ce
= NULL
;
1977 for (i
= 1; i
< o
->head_idx
; i
++) {
1978 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1987 * Deleted in one and unchanged in the other.
1989 if ((head_deleted
&& remote_deleted
) ||
1990 (head_deleted
&& remote
&& remote_match
) ||
1991 (remote_deleted
&& head
&& head_match
)) {
1993 return deleted_entry(index
, index
, o
);
1994 if (ce
&& !head_deleted
) {
1995 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2001 * Added in both, identically.
2003 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
2004 return merged_entry(head
, index
, o
);
2008 /* Below are "no merge" cases, which require that the index be
2009 * up-to-date to avoid the files getting overwritten with
2010 * conflict resolution files.
2013 if (verify_uptodate(index
, o
))
2017 o
->nontrivial_merge
= 1;
2019 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2021 if (!head_match
|| !remote_match
) {
2022 for (i
= 1; i
< o
->head_idx
; i
++) {
2023 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2024 keep_entry(stages
[i
], o
);
2032 fprintf(stderr
, "read-tree: warning #16 detected\n");
2033 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2034 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2037 if (head
) { count
+= keep_entry(head
, o
); }
2038 if (remote
) { count
+= keep_entry(remote
, o
); }
2045 * The rule is to "carry forward" what is in the index without losing
2046 * information across a "fast-forward", favoring a successful merge
2047 * over a merge failure when it makes sense. For details of the
2048 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2051 int twoway_merge(const struct cache_entry
* const *src
,
2052 struct unpack_trees_options
*o
)
2054 const struct cache_entry
*current
= src
[0];
2055 const struct cache_entry
*oldtree
= src
[1];
2056 const struct cache_entry
*newtree
= src
[2];
2058 if (o
->merge_size
!= 2)
2059 return error("Cannot do a twoway merge of %d trees",
2062 if (oldtree
== o
->df_conflict_entry
)
2064 if (newtree
== o
->df_conflict_entry
)
2068 if (current
->ce_flags
& CE_CONFLICTED
) {
2069 if (same(oldtree
, newtree
) || o
->reset
) {
2071 return deleted_entry(current
, current
, o
);
2073 return merged_entry(newtree
, current
, o
);
2075 return reject_merge(current
, o
);
2076 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2077 (!oldtree
&& newtree
&&
2078 same(current
, newtree
)) || /* 6 and 7 */
2079 (oldtree
&& newtree
&&
2080 same(oldtree
, newtree
)) || /* 14 and 15 */
2081 (oldtree
&& newtree
&&
2082 !same(oldtree
, newtree
) && /* 18 and 19 */
2083 same(current
, newtree
))) {
2084 return keep_entry(current
, o
);
2085 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2087 return deleted_entry(oldtree
, current
, o
);
2088 } else if (oldtree
&& newtree
&&
2089 same(current
, oldtree
) && !same(current
, newtree
)) {
2091 return merged_entry(newtree
, current
, o
);
2093 return reject_merge(current
, o
);
2096 if (oldtree
&& !o
->initial_checkout
) {
2098 * deletion of the path was staged;
2100 if (same(oldtree
, newtree
))
2102 return reject_merge(oldtree
, o
);
2104 return merged_entry(newtree
, current
, o
);
2106 return deleted_entry(oldtree
, current
, o
);
2112 * Keep the index entries at stage0, collapse stage1 but make sure
2113 * stage0 does not have anything there.
2115 int bind_merge(const struct cache_entry
* const *src
,
2116 struct unpack_trees_options
*o
)
2118 const struct cache_entry
*old
= src
[0];
2119 const struct cache_entry
*a
= src
[1];
2121 if (o
->merge_size
!= 1)
2122 return error("Cannot do a bind merge of %d trees",
2125 return o
->gently
? -1 :
2126 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2127 super_prefixed(a
->name
),
2128 super_prefixed(old
->name
));
2130 return keep_entry(old
, o
);
2132 return merged_entry(a
, NULL
, o
);
2139 * - take the stat information from stage0, take the data from stage1
2141 int oneway_merge(const struct cache_entry
* const *src
,
2142 struct unpack_trees_options
*o
)
2144 const struct cache_entry
*old
= src
[0];
2145 const struct cache_entry
*a
= src
[1];
2147 if (o
->merge_size
!= 1)
2148 return error("Cannot do a oneway merge of %d trees",
2151 if (!a
|| a
== o
->df_conflict_entry
)
2152 return deleted_entry(old
, old
, o
);
2154 if (old
&& same(old
, a
)) {
2156 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
)) {
2158 if (lstat(old
->name
, &st
) ||
2159 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2160 update
|= CE_UPDATE
;
2162 add_entry(o
, old
, update
, 0);
2165 return merged_entry(a
, old
, o
);