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 "fsmonitor.h"
18 #include "object-store.h"
19 #include "fetch-object.h"
22 * Error messages expected by scripts out of plumbing commands such as
23 * read-tree. Non-scripted Porcelain is not required to use these messages
24 * and in fact are encouraged to reword them to better suit their particular
25 * situation better. See how "git checkout" and "git merge" replaces
26 * them using setup_unpack_trees_porcelain(), for example.
28 static const char *unpack_plumbing_errors
[NB_UNPACK_TREES_ERROR_TYPES
] = {
29 /* ERROR_WOULD_OVERWRITE */
30 "Entry '%s' would be overwritten by merge. Cannot merge.",
32 /* ERROR_NOT_UPTODATE_FILE */
33 "Entry '%s' not uptodate. Cannot merge.",
35 /* ERROR_NOT_UPTODATE_DIR */
36 "Updating '%s' would lose untracked files in it",
38 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
39 "Untracked working tree file '%s' would be overwritten by merge.",
41 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
42 "Untracked working tree file '%s' would be removed by merge.",
44 /* ERROR_BIND_OVERLAP */
45 "Entry '%s' overlaps with '%s'. Cannot bind.",
47 /* ERROR_SPARSE_NOT_UPTODATE_FILE */
48 "Entry '%s' not uptodate. Cannot update sparse checkout.",
50 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
51 "Working tree file '%s' would be overwritten by sparse checkout update.",
53 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
54 "Working tree file '%s' would be removed by sparse checkout update.",
56 /* ERROR_WOULD_LOSE_SUBMODULE */
57 "Submodule '%s' cannot checkout new HEAD.",
60 #define ERRORMSG(o,type) \
61 ( ((o) && (o)->msgs[(type)]) \
62 ? ((o)->msgs[(type)]) \
63 : (unpack_plumbing_errors[(type)]) )
65 static const char *super_prefixed(const char *path
)
68 * It is necessary and sufficient to have two static buffers
69 * here, as the return value of this function is fed to
70 * error() using the unpack_*_errors[] templates we see above.
72 static struct strbuf buf
[2] = {STRBUF_INIT
, STRBUF_INIT
};
73 static int super_prefix_len
= -1;
74 static unsigned idx
= ARRAY_SIZE(buf
) - 1;
76 if (super_prefix_len
< 0) {
77 const char *super_prefix
= get_super_prefix();
82 for (i
= 0; i
< ARRAY_SIZE(buf
); i
++)
83 strbuf_addstr(&buf
[i
], super_prefix
);
84 super_prefix_len
= buf
[0].len
;
88 if (!super_prefix_len
)
91 if (++idx
>= ARRAY_SIZE(buf
))
94 strbuf_setlen(&buf
[idx
], super_prefix_len
);
95 strbuf_addstr(&buf
[idx
], path
);
100 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
104 const char **msgs
= opts
->msgs
;
107 if (!strcmp(cmd
, "checkout"))
108 msg
= advice_commit_before_merge
109 ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
110 "Please commit your changes or stash them before you switch branches.")
111 : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
112 else if (!strcmp(cmd
, "merge"))
113 msg
= advice_commit_before_merge
114 ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
115 "Please commit your changes or stash them before you merge.")
116 : _("Your local changes to the following files would be overwritten by merge:\n%%s");
118 msg
= advice_commit_before_merge
119 ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
120 "Please commit your changes or stash them before you %s.")
121 : _("Your local changes to the following files would be overwritten by %s:\n%%s");
122 msgs
[ERROR_WOULD_OVERWRITE
] = msgs
[ERROR_NOT_UPTODATE_FILE
] =
123 xstrfmt(msg
, cmd
, cmd
);
125 msgs
[ERROR_NOT_UPTODATE_DIR
] =
126 _("Updating the following directories would lose untracked files in them:\n%s");
128 if (!strcmp(cmd
, "checkout"))
129 msg
= advice_commit_before_merge
130 ? _("The following untracked working tree files would be removed by checkout:\n%%s"
131 "Please move or remove them before you switch branches.")
132 : _("The following untracked working tree files would be removed by checkout:\n%%s");
133 else if (!strcmp(cmd
, "merge"))
134 msg
= advice_commit_before_merge
135 ? _("The following untracked working tree files would be removed by merge:\n%%s"
136 "Please move or remove them before you merge.")
137 : _("The following untracked working tree files would be removed by merge:\n%%s");
139 msg
= advice_commit_before_merge
140 ? _("The following untracked working tree files would be removed by %s:\n%%s"
141 "Please move or remove them before you %s.")
142 : _("The following untracked working tree files would be removed by %s:\n%%s");
143 msgs
[ERROR_WOULD_LOSE_UNTRACKED_REMOVED
] = xstrfmt(msg
, cmd
, cmd
);
145 if (!strcmp(cmd
, "checkout"))
146 msg
= advice_commit_before_merge
147 ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
148 "Please move or remove them before you switch branches.")
149 : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
150 else if (!strcmp(cmd
, "merge"))
151 msg
= advice_commit_before_merge
152 ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
153 "Please move or remove them before you merge.")
154 : _("The following untracked working tree files would be overwritten by merge:\n%%s");
156 msg
= advice_commit_before_merge
157 ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
158 "Please move or remove them before you %s.")
159 : _("The following untracked working tree files would be overwritten by %s:\n%%s");
160 msgs
[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
] = xstrfmt(msg
, cmd
, cmd
);
163 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
164 * cannot easily display it as a list.
166 msgs
[ERROR_BIND_OVERLAP
] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
168 msgs
[ERROR_SPARSE_NOT_UPTODATE_FILE
] =
169 _("Cannot update sparse checkout: the following entries are not up to date:\n%s");
170 msgs
[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
] =
171 _("The following working tree files would be overwritten by sparse checkout update:\n%s");
172 msgs
[ERROR_WOULD_LOSE_ORPHANED_REMOVED
] =
173 _("The following working tree files would be removed by sparse checkout update:\n%s");
174 msgs
[ERROR_WOULD_LOSE_SUBMODULE
] =
175 _("Cannot update submodule:\n%s");
177 opts
->show_all_errors
= 1;
178 /* rejected paths may not have a static buffer */
179 for (i
= 0; i
< ARRAY_SIZE(opts
->unpack_rejects
); i
++)
180 opts
->unpack_rejects
[i
].strdup_strings
= 1;
183 static int do_add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
184 unsigned int set
, unsigned int clear
)
191 ce
->ce_flags
= (ce
->ce_flags
& ~clear
) | set
;
192 return add_index_entry(&o
->result
, ce
,
193 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
196 static struct cache_entry
*dup_entry(const struct cache_entry
*ce
)
198 unsigned int size
= ce_size(ce
);
199 struct cache_entry
*new_entry
= xmalloc(size
);
201 memcpy(new_entry
, ce
, size
);
205 static void add_entry(struct unpack_trees_options
*o
,
206 const struct cache_entry
*ce
,
207 unsigned int set
, unsigned int clear
)
209 do_add_entry(o
, dup_entry(ce
), set
, clear
);
213 * add error messages on path <path>
214 * corresponding to the type <e> with the message <msg>
215 * indicating if it should be display in porcelain or not
217 static int add_rejected_path(struct unpack_trees_options
*o
,
218 enum unpack_trees_error_types e
,
221 if (!o
->show_all_errors
)
222 return error(ERRORMSG(o
, e
), super_prefixed(path
));
225 * Otherwise, insert in a list for future display by
226 * display_error_msgs()
228 string_list_append(&o
->unpack_rejects
[e
], path
);
233 * display all the error messages stored in a nice way
235 static void display_error_msgs(struct unpack_trees_options
*o
)
238 int something_displayed
= 0;
239 for (e
= 0; e
< NB_UNPACK_TREES_ERROR_TYPES
; e
++) {
240 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
241 if (rejects
->nr
> 0) {
242 struct strbuf path
= STRBUF_INIT
;
243 something_displayed
= 1;
244 for (i
= 0; i
< rejects
->nr
; i
++)
245 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
246 error(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
247 strbuf_release(&path
);
249 string_list_clear(rejects
, 0);
251 if (something_displayed
)
252 fprintf(stderr
, _("Aborting\n"));
255 static int check_submodule_move_head(const struct cache_entry
*ce
,
258 struct unpack_trees_options
*o
)
260 unsigned flags
= SUBMODULE_MOVE_HEAD_DRY_RUN
;
261 const struct submodule
*sub
= submodule_from_ce(ce
);
267 flags
|= SUBMODULE_MOVE_HEAD_FORCE
;
269 if (submodule_move_head(ce
->name
, old_id
, new_id
, flags
))
270 return o
->gently
? -1 :
271 add_rejected_path(o
, ERROR_WOULD_LOSE_SUBMODULE
, ce
->name
);
276 * Preform the loading of the repository's gitmodules file. This function is
277 * used by 'check_update()' to perform loading of the gitmodules file in two
278 * differnt situations:
279 * (1) before removing entries from the working tree if the gitmodules file has
280 * been marked for removal. This situation is specified by 'state' == NULL.
281 * (2) before checking out entries to the working tree if the gitmodules file
282 * has been marked for update. This situation is specified by 'state' != NULL.
284 static void load_gitmodules_file(struct index_state
*index
,
285 struct checkout
*state
)
287 int pos
= index_name_pos(index
, GITMODULES_FILE
, strlen(GITMODULES_FILE
));
290 struct cache_entry
*ce
= index
->cache
[pos
];
291 if (!state
&& ce
->ce_flags
& CE_WT_REMOVE
) {
292 repo_read_gitmodules(the_repository
);
293 } else if (state
&& (ce
->ce_flags
& CE_UPDATE
)) {
295 checkout_entry(ce
, state
, NULL
);
296 repo_read_gitmodules(the_repository
);
302 * Unlink the last component and schedule the leading directories for
303 * removal, such that empty directories get removed.
305 static void unlink_entry(const struct cache_entry
*ce
)
307 const struct submodule
*sub
= submodule_from_ce(ce
);
309 /* state.force is set at the caller. */
310 submodule_move_head(ce
->name
, "HEAD", NULL
,
311 SUBMODULE_MOVE_HEAD_FORCE
);
313 if (!check_leading_path(ce
->name
, ce_namelen(ce
)))
315 if (remove_or_warn(ce
->ce_mode
, ce
->name
))
317 schedule_dir_for_removal(ce
->name
, ce_namelen(ce
));
320 static struct progress
*get_progress(struct unpack_trees_options
*o
)
322 unsigned cnt
= 0, total
= 0;
323 struct index_state
*index
= &o
->result
;
325 if (!o
->update
|| !o
->verbose_update
)
328 for (; cnt
< index
->cache_nr
; cnt
++) {
329 const struct cache_entry
*ce
= index
->cache
[cnt
];
330 if (ce
->ce_flags
& (CE_UPDATE
| CE_WT_REMOVE
))
334 return start_delayed_progress(_("Checking out files"), total
);
337 static int check_updates(struct unpack_trees_options
*o
)
341 struct progress
*progress
= NULL
;
342 struct index_state
*index
= &o
->result
;
343 struct checkout state
= CHECKOUT_INIT
;
348 state
.refresh_cache
= 1;
349 state
.istate
= index
;
351 progress
= get_progress(o
);
354 git_attr_set_direction(GIT_ATTR_CHECKOUT
, index
);
356 if (should_update_submodules() && o
->update
&& !o
->dry_run
)
357 load_gitmodules_file(index
, NULL
);
359 for (i
= 0; i
< index
->cache_nr
; i
++) {
360 const struct cache_entry
*ce
= index
->cache
[i
];
362 if (ce
->ce_flags
& CE_WT_REMOVE
) {
363 display_progress(progress
, ++cnt
);
364 if (o
->update
&& !o
->dry_run
)
368 remove_marked_cache_entries(index
);
369 remove_scheduled_dirs();
371 if (should_update_submodules() && o
->update
&& !o
->dry_run
)
372 load_gitmodules_file(index
, &state
);
374 enable_delayed_checkout(&state
);
375 if (repository_format_partial_clone
&& o
->update
&& !o
->dry_run
) {
377 * Prefetch the objects that are to be checked out in the loop
380 struct oid_array to_fetch
= OID_ARRAY_INIT
;
381 int fetch_if_missing_store
= fetch_if_missing
;
382 fetch_if_missing
= 0;
383 for (i
= 0; i
< index
->cache_nr
; i
++) {
384 struct cache_entry
*ce
= index
->cache
[i
];
385 if ((ce
->ce_flags
& CE_UPDATE
) &&
386 !S_ISGITLINK(ce
->ce_mode
)) {
387 if (!has_object_file(&ce
->oid
))
388 oid_array_append(&to_fetch
, &ce
->oid
);
392 fetch_objects(repository_format_partial_clone
,
394 fetch_if_missing
= fetch_if_missing_store
;
395 oid_array_clear(&to_fetch
);
397 for (i
= 0; i
< index
->cache_nr
; i
++) {
398 struct cache_entry
*ce
= index
->cache
[i
];
400 if (ce
->ce_flags
& CE_UPDATE
) {
401 if (ce
->ce_flags
& CE_WT_REMOVE
)
402 die("BUG: both update and delete flags are set on %s",
404 display_progress(progress
, ++cnt
);
405 ce
->ce_flags
&= ~CE_UPDATE
;
406 if (o
->update
&& !o
->dry_run
) {
407 errs
|= checkout_entry(ce
, &state
, NULL
);
411 stop_progress(&progress
);
412 errs
|= finish_delayed_checkout(&state
);
414 git_attr_set_direction(GIT_ATTR_CHECKIN
, NULL
);
418 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
419 struct unpack_trees_options
*o
);
420 static int verify_absent_sparse(const struct cache_entry
*ce
,
421 enum unpack_trees_error_types
,
422 struct unpack_trees_options
*o
);
424 static int apply_sparse_checkout(struct index_state
*istate
,
425 struct cache_entry
*ce
,
426 struct unpack_trees_options
*o
)
428 int was_skip_worktree
= ce_skip_worktree(ce
);
430 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
431 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
433 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
434 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
435 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
436 mark_fsmonitor_invalid(istate
, ce
);
437 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
441 * if (!was_skip_worktree && !ce_skip_worktree()) {
442 * This is perfectly normal. Move on;
447 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
448 * area as a result of ce_skip_worktree() shortcuts in
449 * verify_absent() and verify_uptodate().
450 * Make sure they don't modify worktree if they are already
451 * outside checkout area
453 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
454 ce
->ce_flags
&= ~CE_UPDATE
;
457 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
458 * on to get that file removed from both index and worktree.
459 * If that file is already outside worktree area, don't
462 if (ce
->ce_flags
& CE_REMOVE
)
463 ce
->ce_flags
&= ~CE_WT_REMOVE
;
466 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
468 * If CE_UPDATE is set, verify_uptodate() must be called already
469 * also stat info may have lost after merged_entry() so calling
470 * verify_uptodate() again may fail
472 if (!(ce
->ce_flags
& CE_UPDATE
) && verify_uptodate_sparse(ce
, o
))
474 ce
->ce_flags
|= CE_WT_REMOVE
;
475 ce
->ce_flags
&= ~CE_UPDATE
;
477 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
478 if (verify_absent_sparse(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
))
480 ce
->ce_flags
|= CE_UPDATE
;
485 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
486 struct unpack_trees_options
*o
)
488 int ret
= o
->fn(src
, o
);
494 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
496 ce
->ce_flags
|= CE_UNPACKED
;
498 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
499 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
500 int bottom
= o
->cache_bottom
;
501 while (bottom
< o
->src_index
->cache_nr
&&
502 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
504 o
->cache_bottom
= bottom
;
508 static void mark_all_ce_unused(struct index_state
*index
)
511 for (i
= 0; i
< index
->cache_nr
; i
++)
512 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
515 static int locate_in_src_index(const struct cache_entry
*ce
,
516 struct unpack_trees_options
*o
)
518 struct index_state
*index
= o
->src_index
;
519 int len
= ce_namelen(ce
);
520 int pos
= index_name_pos(index
, ce
->name
, len
);
527 * We call unpack_index_entry() with an unmerged cache entry
528 * only in diff-index, and it wants a single callback. Skip
529 * the other unmerged entry with the same name.
531 static void mark_ce_used_same_name(struct cache_entry
*ce
,
532 struct unpack_trees_options
*o
)
534 struct index_state
*index
= o
->src_index
;
535 int len
= ce_namelen(ce
);
538 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
539 struct cache_entry
*next
= index
->cache
[pos
];
540 if (len
!= ce_namelen(next
) ||
541 memcmp(ce
->name
, next
->name
, len
))
543 mark_ce_used(next
, o
);
547 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
549 const struct index_state
*index
= o
->src_index
;
550 int pos
= o
->cache_bottom
;
552 while (pos
< index
->cache_nr
) {
553 struct cache_entry
*ce
= index
->cache
[pos
];
554 if (!(ce
->ce_flags
& CE_UNPACKED
))
561 static void add_same_unmerged(const struct cache_entry
*ce
,
562 struct unpack_trees_options
*o
)
564 struct index_state
*index
= o
->src_index
;
565 int len
= ce_namelen(ce
);
566 int pos
= index_name_pos(index
, ce
->name
, len
);
569 die("programming error in a caller of mark_ce_used_same_name");
570 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
571 struct cache_entry
*next
= index
->cache
[pos
];
572 if (len
!= ce_namelen(next
) ||
573 memcmp(ce
->name
, next
->name
, len
))
575 add_entry(o
, next
, 0, 0);
576 mark_ce_used(next
, o
);
580 static int unpack_index_entry(struct cache_entry
*ce
,
581 struct unpack_trees_options
*o
)
583 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
590 if (o
->skip_unmerged
) {
591 add_entry(o
, ce
, 0, 0);
595 ret
= call_unpack_fn(src
, o
);
597 mark_ce_used_same_name(ce
, o
);
601 static int find_cache_pos(struct traverse_info
*, const struct name_entry
*);
603 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
605 struct unpack_trees_options
*o
= info
->data
;
607 if (o
->diff_index_cached
)
609 o
->cache_bottom
= bottom
;
612 static int switch_cache_bottom(struct traverse_info
*info
)
614 struct unpack_trees_options
*o
= info
->data
;
617 if (o
->diff_index_cached
)
619 ret
= o
->cache_bottom
;
620 pos
= find_cache_pos(info
->prev
, &info
->name
);
623 o
->cache_bottom
= -2 - pos
;
625 o
->cache_bottom
= o
->src_index
->cache_nr
;
629 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
631 return name_j
->oid
&& name_k
->oid
&& !oidcmp(name_j
->oid
, name_k
->oid
);
634 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
635 unsigned long df_conflicts
,
636 struct name_entry
*names
,
637 struct traverse_info
*info
)
641 struct tree_desc t
[MAX_UNPACK_TREES
];
642 void *buf
[MAX_UNPACK_TREES
];
643 struct traverse_info newinfo
;
644 struct name_entry
*p
;
652 newinfo
.pathspec
= info
->pathspec
;
654 newinfo
.pathlen
+= tree_entry_len(p
) + 1;
655 newinfo
.df_conflicts
|= df_conflicts
;
658 * Fetch the tree from the ODB for each peer directory in the
661 * For 2- and 3-way traversals, we try to avoid hitting the
662 * ODB twice for the same OID. This should yield a nice speed
663 * up in checkouts and merges when the commits are similar.
665 * We don't bother doing the full O(n^2) search for larger n,
666 * because wider traversals don't happen that often and we
667 * avoid the search setup.
669 * When 2 peer OIDs are the same, we just copy the tree
670 * descriptor data. This implicitly borrows the buffer
671 * data from the earlier cell.
673 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
674 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
676 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
679 const struct object_id
*oid
= NULL
;
682 buf
[nr_buf
++] = fill_tree_descriptor(t
+ i
, oid
);
686 bottom
= switch_cache_bottom(&newinfo
);
687 ret
= traverse_trees(n
, t
, &newinfo
);
688 restore_cache_bottom(&newinfo
, bottom
);
690 for (i
= 0; i
< nr_buf
; i
++)
697 * Compare the traverse-path to the cache entry without actually
698 * having to generate the textual representation of the traverse
701 * NOTE! This *only* compares up to the size of the traverse path
702 * itself - the caller needs to do the final check for the cache
703 * entry having more data at the end!
705 static int do_compare_entry_piecewise(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
707 int len
, pathlen
, ce_len
;
711 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
716 pathlen
= info
->pathlen
;
717 ce_len
= ce_namelen(ce
);
719 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
720 if (ce_len
< pathlen
)
724 ce_name
= ce
->name
+ pathlen
;
726 len
= tree_entry_len(n
);
727 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
730 static int do_compare_entry(const struct cache_entry
*ce
,
731 const struct traverse_info
*info
,
732 const struct name_entry
*n
)
734 int len
, pathlen
, ce_len
;
739 * If we have not precomputed the traverse path, it is quicker
740 * to avoid doing so. But if we have precomputed it,
741 * it is quicker to use the precomputed version.
743 if (!info
->traverse_path
)
744 return do_compare_entry_piecewise(ce
, info
, n
);
746 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
750 pathlen
= info
->pathlen
;
751 ce_len
= ce_namelen(ce
);
753 if (ce_len
< pathlen
)
757 ce_name
= ce
->name
+ pathlen
;
759 len
= tree_entry_len(n
);
760 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
763 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
765 int cmp
= do_compare_entry(ce
, info
, n
);
770 * Even if the beginning compared identically, the ce should
771 * compare as bigger than a directory leading up to it!
773 return ce_namelen(ce
) > traverse_path_len(info
, n
);
776 static int ce_in_traverse_path(const struct cache_entry
*ce
,
777 const struct traverse_info
*info
)
781 if (do_compare_entry(ce
, info
->prev
, &info
->name
))
784 * If ce (blob) is the same name as the path (which is a tree
785 * we will be descending into), it won't be inside it.
787 return (info
->pathlen
< ce_namelen(ce
));
790 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
, const struct name_entry
*n
, int stage
)
792 int len
= traverse_path_len(info
, n
);
793 struct cache_entry
*ce
= xcalloc(1, cache_entry_size(len
));
795 ce
->ce_mode
= create_ce_mode(n
->mode
);
796 ce
->ce_flags
= create_ce_flags(stage
);
797 ce
->ce_namelen
= len
;
798 oidcpy(&ce
->oid
, n
->oid
);
799 make_traverse_path(ce
->name
, info
, n
);
804 static int unpack_nondirectories(int n
, unsigned long mask
,
805 unsigned long dirmask
,
806 struct cache_entry
**src
,
807 const struct name_entry
*names
,
808 const struct traverse_info
*info
)
811 struct unpack_trees_options
*o
= info
->data
;
812 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
814 /* Do we have *only* directories? Nothing to do */
815 if (mask
== dirmask
&& !src
[0])
819 * Ok, we've filled in up to any potential index entry in src[0],
822 for (i
= 0; i
< n
; i
++) {
824 unsigned int bit
= 1ul << i
;
825 if (conflicts
& bit
) {
826 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
833 else if (i
+ 1 < o
->head_idx
)
835 else if (i
+ 1 > o
->head_idx
)
839 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
);
843 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
845 for (i
= 0; i
< n
; i
++) {
846 struct cache_entry
*ce
= src
[i
+ o
->merge
];
847 if (ce
!= o
->df_conflict_entry
)
853 for (i
= 0; i
< n
; i
++)
854 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
855 if (do_add_entry(o
, src
[i
], 0, 0))
861 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
863 discard_index(&o
->result
);
864 if (!o
->gently
&& !o
->exiting_early
) {
866 return error("%s", message
);
873 * The tree traversal is looking at name p. If we have a matching entry,
874 * return it. If name p is a directory in the index, do not return
875 * anything, as we will want to match it when the traversal descends into
878 static int find_cache_pos(struct traverse_info
*info
,
879 const struct name_entry
*p
)
882 struct unpack_trees_options
*o
= info
->data
;
883 struct index_state
*index
= o
->src_index
;
884 int pfxlen
= info
->pathlen
;
885 int p_len
= tree_entry_len(p
);
887 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
888 const struct cache_entry
*ce
= index
->cache
[pos
];
889 const char *ce_name
, *ce_slash
;
892 if (ce
->ce_flags
& CE_UNPACKED
) {
894 * cache_bottom entry is already unpacked, so
895 * we can never match it; don't check it
898 if (pos
== o
->cache_bottom
)
902 if (!ce_in_traverse_path(ce
, info
)) {
904 * Check if we can skip future cache checks
905 * (because we're already past all possible
906 * entries in the traverse path).
908 if (info
->traverse_path
) {
909 if (strncmp(ce
->name
, info
->traverse_path
,
915 ce_name
= ce
->name
+ pfxlen
;
916 ce_slash
= strchr(ce_name
, '/');
918 ce_len
= ce_slash
- ce_name
;
920 ce_len
= ce_namelen(ce
) - pfxlen
;
921 cmp
= name_compare(p
->path
, p_len
, ce_name
, ce_len
);
923 * Exact match; if we have a directory we need to
924 * delay returning it.
927 return ce_slash
? -2 - pos
: pos
;
929 continue; /* keep looking */
931 * ce_name sorts after p->path; could it be that we
932 * have files under p->path directory in the index?
933 * E.g. ce_name == "t-i", and p->path == "t"; we may
934 * have "t/a" in the index.
936 if (p_len
< ce_len
&& !memcmp(ce_name
, p
->path
, p_len
) &&
937 ce_name
[p_len
] < '/')
938 continue; /* keep looking */
944 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
945 const struct name_entry
*p
)
947 int pos
= find_cache_pos(info
, p
);
948 struct unpack_trees_options
*o
= info
->data
;
951 return o
->src_index
->cache
[pos
];
956 static void debug_path(struct traverse_info
*info
)
959 debug_path(info
->prev
);
960 if (*info
->prev
->name
.path
)
963 printf("%s", info
->name
.path
);
966 static void debug_name_entry(int i
, struct name_entry
*n
)
968 printf("ent#%d %06o %s\n", i
,
969 n
->path
? n
->mode
: 0,
970 n
->path
? n
->path
: "(missing)");
973 static void debug_unpack_callback(int n
,
975 unsigned long dirmask
,
976 struct name_entry
*names
,
977 struct traverse_info
*info
)
980 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
984 for (i
= 0; i
< n
; i
++)
985 debug_name_entry(i
, names
+ i
);
988 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
990 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
991 struct unpack_trees_options
*o
= info
->data
;
992 const struct name_entry
*p
= names
;
994 /* Find first entry with a real name (we could use "mask" too) */
999 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
1001 /* Are we supposed to look at the index too? */
1005 struct cache_entry
*ce
;
1007 if (o
->diff_index_cached
)
1008 ce
= next_cache_entry(o
);
1010 ce
= find_cache_entry(info
, p
);
1014 cmp
= compare_entry(ce
, info
, p
);
1016 if (unpack_index_entry(ce
, o
) < 0)
1017 return unpack_failed(o
, NULL
);
1023 * If we skip unmerged index
1024 * entries, we'll skip this
1025 * entry *and* the tree
1026 * entries associated with it!
1028 if (o
->skip_unmerged
) {
1029 add_same_unmerged(ce
, o
);
1039 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
1042 if (o
->merge
&& src
[0]) {
1043 if (ce_stage(src
[0]))
1044 mark_ce_used_same_name(src
[0], o
);
1046 mark_ce_used(src
[0], o
);
1049 /* Now handle any directories.. */
1051 /* special case: "diff-index --cached" looking at a tree */
1052 if (o
->diff_index_cached
&&
1053 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1055 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1058 * Everything under the name matches; skip the
1059 * entire hierarchy. diff_index_cached codepath
1060 * special cases D/F conflicts in such a way that
1061 * it does not do any look-ahead, so this is safe.
1064 o
->cache_bottom
+= matches
;
1069 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1078 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1079 struct strbuf
*prefix
,
1080 int select_mask
, int clear_mask
,
1081 struct exclude_list
*el
, int defval
);
1083 /* Whole directory matching */
1084 static int clear_ce_flags_dir(struct cache_entry
**cache
, int nr
,
1085 struct strbuf
*prefix
,
1087 int select_mask
, int clear_mask
,
1088 struct exclude_list
*el
, int defval
)
1090 struct cache_entry
**cache_end
;
1092 int ret
= is_excluded_from_list(prefix
->buf
, prefix
->len
,
1093 basename
, &dtype
, el
, &the_index
);
1096 strbuf_addch(prefix
, '/');
1098 /* If undecided, use matching result of parent dir in defval */
1102 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1103 struct cache_entry
*ce
= *cache_end
;
1104 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1109 * TODO: check el, if there are no patterns that may conflict
1110 * with ret (iow, we know in advance the incl/excl
1111 * decision for the entire directory), clear flag here without
1112 * calling clear_ce_flags_1(). That function will call
1113 * the expensive is_excluded_from_list() on every entry.
1115 rc
= clear_ce_flags_1(cache
, cache_end
- cache
,
1117 select_mask
, clear_mask
,
1119 strbuf_setlen(prefix
, prefix
->len
- 1);
1124 * Traverse the index, find every entry that matches according to
1125 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
1126 * number of traversed entries.
1128 * If select_mask is non-zero, only entries whose ce_flags has on of
1129 * those bits enabled are traversed.
1131 * cache : pointer to an index entry
1132 * prefix_len : an offset to its path
1134 * The current path ("prefix") including the trailing '/' is
1135 * cache[0]->name[0..(prefix_len-1)]
1136 * Top level path has prefix_len zero.
1138 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1139 struct strbuf
*prefix
,
1140 int select_mask
, int clear_mask
,
1141 struct exclude_list
*el
, int defval
)
1143 struct cache_entry
**cache_end
= cache
+ nr
;
1146 * Process all entries that have the given prefix and meet
1147 * select_mask condition
1149 while(cache
!= cache_end
) {
1150 struct cache_entry
*ce
= *cache
;
1151 const char *name
, *slash
;
1152 int len
, dtype
, ret
;
1154 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1159 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1162 name
= ce
->name
+ prefix
->len
;
1163 slash
= strchr(name
, '/');
1165 /* If it's a directory, try whole directory match first */
1170 strbuf_add(prefix
, name
, len
);
1172 processed
= clear_ce_flags_dir(cache
, cache_end
- cache
,
1174 prefix
->buf
+ prefix
->len
- len
,
1175 select_mask
, clear_mask
,
1178 /* clear_c_f_dir eats a whole dir already? */
1181 strbuf_setlen(prefix
, prefix
->len
- len
);
1185 strbuf_addch(prefix
, '/');
1186 cache
+= clear_ce_flags_1(cache
, cache_end
- cache
,
1188 select_mask
, clear_mask
, el
, defval
);
1189 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1194 dtype
= ce_to_dtype(ce
);
1195 ret
= is_excluded_from_list(ce
->name
, ce_namelen(ce
),
1196 name
, &dtype
, el
, &the_index
);
1200 ce
->ce_flags
&= ~clear_mask
;
1203 return nr
- (cache_end
- cache
);
1206 static int clear_ce_flags(struct cache_entry
**cache
, int nr
,
1207 int select_mask
, int clear_mask
,
1208 struct exclude_list
*el
)
1210 static struct strbuf prefix
= STRBUF_INIT
;
1212 strbuf_reset(&prefix
);
1214 return clear_ce_flags_1(cache
, nr
,
1216 select_mask
, clear_mask
,
1221 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1223 static void mark_new_skip_worktree(struct exclude_list
*el
,
1224 struct index_state
*the_index
,
1225 int select_flag
, int skip_wt_flag
)
1230 * 1. Pretend the narrowest worktree: only unmerged entries
1233 for (i
= 0; i
< the_index
->cache_nr
; i
++) {
1234 struct cache_entry
*ce
= the_index
->cache
[i
];
1236 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1240 ce
->ce_flags
|= skip_wt_flag
;
1242 ce
->ce_flags
&= ~skip_wt_flag
;
1246 * 2. Widen worktree according to sparse-checkout file.
1247 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1249 clear_ce_flags(the_index
->cache
, the_index
->cache_nr
,
1250 select_flag
, skip_wt_flag
, el
);
1253 static int verify_absent(const struct cache_entry
*,
1254 enum unpack_trees_error_types
,
1255 struct unpack_trees_options
*);
1257 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1258 * resulting index, -2 on failure to reflect the changes to the work tree.
1260 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1262 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1265 static struct cache_entry
*dfc
;
1266 struct exclude_list el
;
1268 if (len
> MAX_UNPACK_TREES
)
1269 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1271 memset(&el
, 0, sizeof(el
));
1272 if (!core_apply_sparse_checkout
|| !o
->update
)
1273 o
->skip_sparse_checkout
= 1;
1274 if (!o
->skip_sparse_checkout
) {
1275 char *sparse
= git_pathdup("info/sparse-checkout");
1276 if (add_excludes_from_file_to_list(sparse
, "", 0, &el
, NULL
) < 0)
1277 o
->skip_sparse_checkout
= 1;
1283 memset(&o
->result
, 0, sizeof(o
->result
));
1284 o
->result
.initialized
= 1;
1285 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1286 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1287 o
->result
.version
= o
->src_index
->version
;
1288 o
->result
.split_index
= o
->src_index
->split_index
;
1289 if (o
->result
.split_index
)
1290 o
->result
.split_index
->refcount
++;
1291 hashcpy(o
->result
.sha1
, o
->src_index
->sha1
);
1292 o
->merge_size
= len
;
1293 mark_all_ce_unused(o
->src_index
);
1296 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1298 if (!o
->skip_sparse_checkout
)
1299 mark_new_skip_worktree(o
->el
, o
->src_index
, 0, CE_NEW_SKIP_WORKTREE
);
1302 dfc
= xcalloc(1, cache_entry_size(0));
1303 o
->df_conflict_entry
= dfc
;
1306 const char *prefix
= o
->prefix
? o
->prefix
: "";
1307 struct traverse_info info
;
1309 setup_traverse_info(&info
, prefix
);
1310 info
.fn
= unpack_callback
;
1312 info
.show_all_errors
= o
->show_all_errors
;
1313 info
.pathspec
= o
->pathspec
;
1317 * Unpack existing index entries that sort before the
1318 * prefix the tree is spliced into. Note that o->merge
1319 * is always true in this case.
1322 struct cache_entry
*ce
= next_cache_entry(o
);
1325 if (ce_in_traverse_path(ce
, &info
))
1327 if (unpack_index_entry(ce
, o
) < 0)
1332 if (traverse_trees(len
, t
, &info
) < 0)
1336 /* Any left-over entries in the index? */
1339 struct cache_entry
*ce
= next_cache_entry(o
);
1342 if (unpack_index_entry(ce
, o
) < 0)
1346 mark_all_ce_unused(o
->src_index
);
1348 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1349 ret
= unpack_failed(o
, "Merge requires file-level merging");
1353 if (!o
->skip_sparse_checkout
) {
1354 int empty_worktree
= 1;
1357 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1358 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1359 * so apply_sparse_checkout() won't attempt to remove it from worktree
1361 mark_new_skip_worktree(o
->el
, &o
->result
, CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1364 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1365 struct cache_entry
*ce
= o
->result
.cache
[i
];
1368 * Entries marked with CE_ADDED in merged_entry() do not have
1369 * verify_absent() check (the check is effectively disabled
1370 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1372 * Do the real check now because we have had
1373 * correct CE_NEW_SKIP_WORKTREE
1375 if (ce
->ce_flags
& CE_ADDED
&&
1376 verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1377 if (!o
->show_all_errors
)
1382 if (apply_sparse_checkout(&o
->result
, ce
, o
)) {
1383 if (!o
->show_all_errors
)
1387 if (!ce_skip_worktree(ce
))
1394 * Sparse checkout is meant to narrow down checkout area
1395 * but it does not make sense to narrow down to empty working
1396 * tree. This is usually a mistake in sparse checkout rules.
1397 * Do not allow users to do that.
1399 if (o
->result
.cache_nr
&& empty_worktree
) {
1400 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1405 o
->src_index
= NULL
;
1406 ret
= check_updates(o
) ? (-2) : 0;
1409 if (!o
->result
.cache_tree
)
1410 o
->result
.cache_tree
= cache_tree();
1411 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1412 cache_tree_update(&o
->result
,
1416 move_index_extensions(&o
->result
, o
->dst_index
);
1417 discard_index(o
->dst_index
);
1418 *o
->dst_index
= o
->result
;
1420 discard_index(&o
->result
);
1424 clear_exclude_list(&el
);
1428 if (o
->show_all_errors
)
1429 display_error_msgs(o
);
1430 mark_all_ce_unused(o
->src_index
);
1431 ret
= unpack_failed(o
, NULL
);
1432 if (o
->exiting_early
)
1437 /* Here come the merge functions */
1439 static int reject_merge(const struct cache_entry
*ce
,
1440 struct unpack_trees_options
*o
)
1442 return o
->gently
? -1 :
1443 add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1446 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1452 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1454 return a
->ce_mode
== b
->ce_mode
&&
1455 !oidcmp(&a
->oid
, &b
->oid
);
1460 * When a CE gets turned into an unmerged entry, we
1461 * want it to be up-to-date
1463 static int verify_uptodate_1(const struct cache_entry
*ce
,
1464 struct unpack_trees_options
*o
,
1465 enum unpack_trees_error_types error_type
)
1473 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1474 * if this entry is truly up-to-date because this file may be
1477 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1478 ; /* keep checking */
1479 else if (o
->reset
|| ce_uptodate(ce
))
1482 if (!lstat(ce
->name
, &st
)) {
1483 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1484 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1486 if (submodule_from_ce(ce
)) {
1487 int r
= check_submodule_move_head(ce
,
1488 "HEAD", oid_to_hex(&ce
->oid
), o
);
1490 return o
->gently
? -1 :
1491 add_rejected_path(o
, error_type
, ce
->name
);
1498 * Historic default policy was to allow submodule to be out
1499 * of sync wrt the superproject index. If the submodule was
1500 * not considered interesting above, we don't care here.
1502 if (S_ISGITLINK(ce
->ce_mode
))
1507 if (errno
== ENOENT
)
1509 return o
->gently
? -1 :
1510 add_rejected_path(o
, error_type
, ce
->name
);
1513 static int verify_uptodate(const struct cache_entry
*ce
,
1514 struct unpack_trees_options
*o
)
1516 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1518 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1521 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1522 struct unpack_trees_options
*o
)
1524 return verify_uptodate_1(ce
, o
, ERROR_SPARSE_NOT_UPTODATE_FILE
);
1527 static void invalidate_ce_path(const struct cache_entry
*ce
,
1528 struct unpack_trees_options
*o
)
1532 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1533 untracked_cache_invalidate_path(o
->src_index
, ce
->name
, 1);
1537 * Check that checking out ce->sha1 in subdir ce->name is not
1538 * going to overwrite any working files.
1540 * Currently, git does not checkout subprojects during a superproject
1541 * checkout, so it is not going to overwrite anything.
1543 static int verify_clean_submodule(const char *old_sha1
,
1544 const struct cache_entry
*ce
,
1545 enum unpack_trees_error_types error_type
,
1546 struct unpack_trees_options
*o
)
1548 if (!submodule_from_ce(ce
))
1551 return check_submodule_move_head(ce
, old_sha1
,
1552 oid_to_hex(&ce
->oid
), o
);
1555 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1556 enum unpack_trees_error_types error_type
,
1557 struct unpack_trees_options
*o
)
1560 * we are about to extract "ce->name"; we would not want to lose
1561 * anything in the existing directory there.
1565 struct dir_struct d
;
1569 if (S_ISGITLINK(ce
->ce_mode
)) {
1570 struct object_id oid
;
1571 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", &oid
);
1573 * If we are not going to update the submodule, then
1576 if (!sub_head
&& !oidcmp(&oid
, &ce
->oid
))
1578 return verify_clean_submodule(sub_head
? NULL
: oid_to_hex(&oid
),
1583 * First let's make sure we do not have a local modification
1584 * in that directory.
1586 namelen
= ce_namelen(ce
);
1587 for (i
= locate_in_src_index(ce
, o
);
1588 i
< o
->src_index
->cache_nr
;
1590 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1591 int len
= ce_namelen(ce2
);
1592 if (len
< namelen
||
1593 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1594 ce2
->name
[namelen
] != '/')
1597 * ce2->name is an entry in the subdirectory to be
1600 if (!ce_stage(ce2
)) {
1601 if (verify_uptodate(ce2
, o
))
1603 add_entry(o
, ce2
, CE_REMOVE
, 0);
1604 mark_ce_used(ce2
, o
);
1610 * Then we need to make sure that we do not lose a locally
1611 * present file that is not ignored.
1613 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
1615 memset(&d
, 0, sizeof(d
));
1617 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
1618 i
= read_directory(&d
, &the_index
, pathbuf
, namelen
+1, NULL
);
1620 return o
->gently
? -1 :
1621 add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
1627 * This gets called when there was no index entry for the tree entry 'dst',
1628 * but we found a file in the working tree that 'lstat()' said was fine,
1629 * and we're on a case-insensitive filesystem.
1631 * See if we can find a case-insensitive match in the index that also
1632 * matches the stat information, and assume it's that other file!
1634 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
1636 const struct cache_entry
*src
;
1638 src
= index_file_exists(o
->src_index
, name
, len
, 1);
1639 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
1642 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
1643 const struct cache_entry
*ce
, struct stat
*st
,
1644 enum unpack_trees_error_types error_type
,
1645 struct unpack_trees_options
*o
)
1647 const struct cache_entry
*result
;
1650 * It may be that the 'lstat()' succeeded even though
1651 * target 'ce' was absent, because there is an old
1652 * entry that is different only in case..
1654 * Ignore that lstat() if it matches.
1656 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
1660 is_excluded(o
->dir
, &the_index
, name
, &dtype
))
1662 * ce->name is explicitly excluded, so it is Ok to
1666 if (S_ISDIR(st
->st_mode
)) {
1668 * We are checking out path "foo" and
1669 * found "foo/." in the working tree.
1670 * This is tricky -- if we have modified
1671 * files that are in "foo/" we would lose
1674 if (verify_clean_subdirectory(ce
, error_type
, o
) < 0)
1680 * The previous round may already have decided to
1681 * delete this path, which is in a subdirectory that
1682 * is being replaced with a blob.
1684 result
= index_file_exists(&o
->result
, name
, len
, 0);
1686 if (result
->ce_flags
& CE_REMOVE
)
1690 return o
->gently
? -1 :
1691 add_rejected_path(o
, error_type
, name
);
1695 * We do not want to remove or overwrite a working tree file that
1696 * is not tracked, unless it is ignored.
1698 static int verify_absent_1(const struct cache_entry
*ce
,
1699 enum unpack_trees_error_types error_type
,
1700 struct unpack_trees_options
*o
)
1705 if (o
->index_only
|| o
->reset
|| !o
->update
)
1708 len
= check_leading_path(ce
->name
, ce_namelen(ce
));
1715 path
= xmemdupz(ce
->name
, len
);
1716 if (lstat(path
, &st
))
1717 ret
= error_errno("cannot stat '%s'", path
);
1719 if (submodule_from_ce(ce
))
1720 ret
= check_submodule_move_head(ce
,
1721 oid_to_hex(&ce
->oid
),
1724 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
1725 &st
, error_type
, o
);
1729 } else if (lstat(ce
->name
, &st
)) {
1730 if (errno
!= ENOENT
)
1731 return error_errno("cannot stat '%s'", ce
->name
);
1734 if (submodule_from_ce(ce
))
1735 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
1738 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
1739 ce_to_dtype(ce
), ce
, &st
,
1744 static int verify_absent(const struct cache_entry
*ce
,
1745 enum unpack_trees_error_types error_type
,
1746 struct unpack_trees_options
*o
)
1748 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1750 return verify_absent_1(ce
, error_type
, o
);
1753 static int verify_absent_sparse(const struct cache_entry
*ce
,
1754 enum unpack_trees_error_types error_type
,
1755 struct unpack_trees_options
*o
)
1757 enum unpack_trees_error_types orphaned_error
= error_type
;
1758 if (orphaned_error
== ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
)
1759 orphaned_error
= ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
;
1761 return verify_absent_1(ce
, orphaned_error
, o
);
1764 static int merged_entry(const struct cache_entry
*ce
,
1765 const struct cache_entry
*old
,
1766 struct unpack_trees_options
*o
)
1768 int update
= CE_UPDATE
;
1769 struct cache_entry
*merge
= dup_entry(ce
);
1773 * New index entries. In sparse checkout, the following
1774 * verify_absent() will be delayed until after
1775 * traverse_trees() finishes in unpack_trees(), then:
1777 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1778 * - verify_absent() be called again, this time with
1779 * correct CE_NEW_SKIP_WORKTREE
1781 * verify_absent() call here does nothing in sparse
1782 * checkout (i.e. o->skip_sparse_checkout == 0)
1785 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
1787 if (verify_absent(merge
,
1788 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1792 invalidate_ce_path(merge
, o
);
1794 if (submodule_from_ce(ce
)) {
1795 int ret
= check_submodule_move_head(ce
, NULL
,
1796 oid_to_hex(&ce
->oid
),
1802 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
1804 * See if we can re-use the old CE directly?
1805 * That way we get the uptodate stat info.
1807 * This also removes the UPDATE flag on a match; otherwise
1808 * we will end up overwriting local changes in the work tree.
1810 if (same(old
, merge
)) {
1811 copy_cache_entry(merge
, old
);
1814 if (verify_uptodate(old
, o
)) {
1818 /* Migrate old flags over */
1819 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1820 invalidate_ce_path(old
, o
);
1823 if (submodule_from_ce(ce
)) {
1824 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
1825 oid_to_hex(&ce
->oid
),
1832 * Previously unmerged entry left as an existence
1833 * marker by read_index_unmerged();
1835 invalidate_ce_path(old
, o
);
1838 do_add_entry(o
, merge
, update
, CE_STAGEMASK
);
1842 static int deleted_entry(const struct cache_entry
*ce
,
1843 const struct cache_entry
*old
,
1844 struct unpack_trees_options
*o
)
1846 /* Did it exist in the index? */
1848 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1852 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
1854 add_entry(o
, ce
, CE_REMOVE
, 0);
1855 invalidate_ce_path(ce
, o
);
1859 static int keep_entry(const struct cache_entry
*ce
,
1860 struct unpack_trees_options
*o
)
1862 add_entry(o
, ce
, 0, 0);
1867 static void show_stage_entry(FILE *o
,
1868 const char *label
, const struct cache_entry
*ce
)
1871 fprintf(o
, "%s (missing)\n", label
);
1873 fprintf(o
, "%s%06o %s %d\t%s\n",
1876 oid_to_hex(&ce
->oid
),
1882 int threeway_merge(const struct cache_entry
* const *stages
,
1883 struct unpack_trees_options
*o
)
1885 const struct cache_entry
*index
;
1886 const struct cache_entry
*head
;
1887 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
1890 int remote_match
= 0;
1892 int df_conflict_head
= 0;
1893 int df_conflict_remote
= 0;
1895 int any_anc_missing
= 0;
1896 int no_anc_exists
= 1;
1899 for (i
= 1; i
< o
->head_idx
; i
++) {
1900 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
1901 any_anc_missing
= 1;
1907 head
= stages
[o
->head_idx
];
1909 if (head
== o
->df_conflict_entry
) {
1910 df_conflict_head
= 1;
1914 if (remote
== o
->df_conflict_entry
) {
1915 df_conflict_remote
= 1;
1920 * First, if there's a #16 situation, note that to prevent #13
1923 if (!same(remote
, head
)) {
1924 for (i
= 1; i
< o
->head_idx
; i
++) {
1925 if (same(stages
[i
], head
)) {
1928 if (same(stages
[i
], remote
)) {
1935 * We start with cases where the index is allowed to match
1936 * something other than the head: #14(ALT) and #2ALT, where it
1937 * is permitted to match the result instead.
1939 /* #14, #14ALT, #2ALT */
1940 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
1941 if (index
&& !same(index
, remote
) && !same(index
, head
))
1942 return reject_merge(index
, o
);
1943 return merged_entry(remote
, index
, o
);
1946 * If we have an entry in the index cache, then we want to
1947 * make sure that it matches head.
1949 if (index
&& !same(index
, head
))
1950 return reject_merge(index
, o
);
1954 if (same(head
, remote
))
1955 return merged_entry(head
, index
, o
);
1957 if (!df_conflict_remote
&& remote_match
&& !head_match
)
1958 return merged_entry(head
, index
, o
);
1962 if (!head
&& !remote
&& any_anc_missing
)
1966 * Under the "aggressive" rule, we resolve mostly trivial
1967 * cases that we historically had git-merge-one-file resolve.
1969 if (o
->aggressive
) {
1970 int head_deleted
= !head
;
1971 int remote_deleted
= !remote
;
1972 const struct cache_entry
*ce
= NULL
;
1981 for (i
= 1; i
< o
->head_idx
; i
++) {
1982 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1991 * Deleted in one and unchanged in the other.
1993 if ((head_deleted
&& remote_deleted
) ||
1994 (head_deleted
&& remote
&& remote_match
) ||
1995 (remote_deleted
&& head
&& head_match
)) {
1997 return deleted_entry(index
, index
, o
);
1998 if (ce
&& !head_deleted
) {
1999 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2005 * Added in both, identically.
2007 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
2008 return merged_entry(head
, index
, o
);
2012 /* Below are "no merge" cases, which require that the index be
2013 * up-to-date to avoid the files getting overwritten with
2014 * conflict resolution files.
2017 if (verify_uptodate(index
, o
))
2021 o
->nontrivial_merge
= 1;
2023 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2025 if (!head_match
|| !remote_match
) {
2026 for (i
= 1; i
< o
->head_idx
; i
++) {
2027 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2028 keep_entry(stages
[i
], o
);
2036 fprintf(stderr
, "read-tree: warning #16 detected\n");
2037 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2038 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2041 if (head
) { count
+= keep_entry(head
, o
); }
2042 if (remote
) { count
+= keep_entry(remote
, o
); }
2049 * The rule is to "carry forward" what is in the index without losing
2050 * information across a "fast-forward", favoring a successful merge
2051 * over a merge failure when it makes sense. For details of the
2052 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2055 int twoway_merge(const struct cache_entry
* const *src
,
2056 struct unpack_trees_options
*o
)
2058 const struct cache_entry
*current
= src
[0];
2059 const struct cache_entry
*oldtree
= src
[1];
2060 const struct cache_entry
*newtree
= src
[2];
2062 if (o
->merge_size
!= 2)
2063 return error("Cannot do a twoway merge of %d trees",
2066 if (oldtree
== o
->df_conflict_entry
)
2068 if (newtree
== o
->df_conflict_entry
)
2072 if (current
->ce_flags
& CE_CONFLICTED
) {
2073 if (same(oldtree
, newtree
) || o
->reset
) {
2075 return deleted_entry(current
, current
, o
);
2077 return merged_entry(newtree
, current
, o
);
2079 return reject_merge(current
, o
);
2080 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2081 (!oldtree
&& newtree
&&
2082 same(current
, newtree
)) || /* 6 and 7 */
2083 (oldtree
&& newtree
&&
2084 same(oldtree
, newtree
)) || /* 14 and 15 */
2085 (oldtree
&& newtree
&&
2086 !same(oldtree
, newtree
) && /* 18 and 19 */
2087 same(current
, newtree
))) {
2088 return keep_entry(current
, o
);
2089 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2091 return deleted_entry(oldtree
, current
, o
);
2092 } else if (oldtree
&& newtree
&&
2093 same(current
, oldtree
) && !same(current
, newtree
)) {
2095 return merged_entry(newtree
, current
, o
);
2097 return reject_merge(current
, o
);
2100 if (oldtree
&& !o
->initial_checkout
) {
2102 * deletion of the path was staged;
2104 if (same(oldtree
, newtree
))
2106 return reject_merge(oldtree
, o
);
2108 return merged_entry(newtree
, current
, o
);
2110 return deleted_entry(oldtree
, current
, o
);
2116 * Keep the index entries at stage0, collapse stage1 but make sure
2117 * stage0 does not have anything there.
2119 int bind_merge(const struct cache_entry
* const *src
,
2120 struct unpack_trees_options
*o
)
2122 const struct cache_entry
*old
= src
[0];
2123 const struct cache_entry
*a
= src
[1];
2125 if (o
->merge_size
!= 1)
2126 return error("Cannot do a bind merge of %d trees",
2129 return o
->gently
? -1 :
2130 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2131 super_prefixed(a
->name
),
2132 super_prefixed(old
->name
));
2134 return keep_entry(old
, o
);
2136 return merged_entry(a
, NULL
, o
);
2143 * - take the stat information from stage0, take the data from stage1
2145 int oneway_merge(const struct cache_entry
* const *src
,
2146 struct unpack_trees_options
*o
)
2148 const struct cache_entry
*old
= src
[0];
2149 const struct cache_entry
*a
= src
[1];
2151 if (o
->merge_size
!= 1)
2152 return error("Cannot do a oneway merge of %d trees",
2155 if (!a
|| a
== o
->df_conflict_entry
)
2156 return deleted_entry(old
, old
, o
);
2158 if (old
&& same(old
, a
)) {
2160 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
)) {
2162 if (lstat(old
->name
, &st
) ||
2163 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2164 update
|= CE_UPDATE
;
2166 if (o
->update
&& S_ISGITLINK(old
->ce_mode
) &&
2167 should_update_submodules() && !verify_uptodate(old
, o
))
2168 update
|= CE_UPDATE
;
2169 add_entry(o
, old
, update
, 0);
2172 return merged_entry(a
, old
, o
);