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
;
393 oid_array_clear(&to_fetch
);
395 for (i
= 0; i
< index
->cache_nr
; i
++) {
396 struct cache_entry
*ce
= index
->cache
[i
];
398 if (ce
->ce_flags
& CE_UPDATE
) {
399 if (ce
->ce_flags
& CE_WT_REMOVE
)
400 die("BUG: both update and delete flags are set on %s",
402 display_progress(progress
, ++cnt
);
403 ce
->ce_flags
&= ~CE_UPDATE
;
404 if (o
->update
&& !o
->dry_run
) {
405 errs
|= checkout_entry(ce
, &state
, NULL
);
409 stop_progress(&progress
);
410 errs
|= finish_delayed_checkout(&state
);
412 git_attr_set_direction(GIT_ATTR_CHECKIN
, NULL
);
416 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
417 struct unpack_trees_options
*o
);
418 static int verify_absent_sparse(const struct cache_entry
*ce
,
419 enum unpack_trees_error_types
,
420 struct unpack_trees_options
*o
);
422 static int apply_sparse_checkout(struct index_state
*istate
,
423 struct cache_entry
*ce
,
424 struct unpack_trees_options
*o
)
426 int was_skip_worktree
= ce_skip_worktree(ce
);
428 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
429 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
431 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
432 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
433 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
434 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
438 * if (!was_skip_worktree && !ce_skip_worktree()) {
439 * This is perfectly normal. Move on;
444 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
445 * area as a result of ce_skip_worktree() shortcuts in
446 * verify_absent() and verify_uptodate().
447 * Make sure they don't modify worktree if they are already
448 * outside checkout area
450 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
451 ce
->ce_flags
&= ~CE_UPDATE
;
454 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
455 * on to get that file removed from both index and worktree.
456 * If that file is already outside worktree area, don't
459 if (ce
->ce_flags
& CE_REMOVE
)
460 ce
->ce_flags
&= ~CE_WT_REMOVE
;
463 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
465 * If CE_UPDATE is set, verify_uptodate() must be called already
466 * also stat info may have lost after merged_entry() so calling
467 * verify_uptodate() again may fail
469 if (!(ce
->ce_flags
& CE_UPDATE
) && verify_uptodate_sparse(ce
, o
))
471 ce
->ce_flags
|= CE_WT_REMOVE
;
472 ce
->ce_flags
&= ~CE_UPDATE
;
474 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
475 if (verify_absent_sparse(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
))
477 ce
->ce_flags
|= CE_UPDATE
;
482 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
483 struct unpack_trees_options
*o
)
485 int ret
= o
->fn(src
, o
);
491 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
493 ce
->ce_flags
|= CE_UNPACKED
;
495 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
496 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
497 int bottom
= o
->cache_bottom
;
498 while (bottom
< o
->src_index
->cache_nr
&&
499 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
501 o
->cache_bottom
= bottom
;
505 static void mark_all_ce_unused(struct index_state
*index
)
508 for (i
= 0; i
< index
->cache_nr
; i
++)
509 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
512 static int locate_in_src_index(const struct cache_entry
*ce
,
513 struct unpack_trees_options
*o
)
515 struct index_state
*index
= o
->src_index
;
516 int len
= ce_namelen(ce
);
517 int pos
= index_name_pos(index
, ce
->name
, len
);
524 * We call unpack_index_entry() with an unmerged cache entry
525 * only in diff-index, and it wants a single callback. Skip
526 * the other unmerged entry with the same name.
528 static void mark_ce_used_same_name(struct cache_entry
*ce
,
529 struct unpack_trees_options
*o
)
531 struct index_state
*index
= o
->src_index
;
532 int len
= ce_namelen(ce
);
535 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
536 struct cache_entry
*next
= index
->cache
[pos
];
537 if (len
!= ce_namelen(next
) ||
538 memcmp(ce
->name
, next
->name
, len
))
540 mark_ce_used(next
, o
);
544 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
546 const struct index_state
*index
= o
->src_index
;
547 int pos
= o
->cache_bottom
;
549 while (pos
< index
->cache_nr
) {
550 struct cache_entry
*ce
= index
->cache
[pos
];
551 if (!(ce
->ce_flags
& CE_UNPACKED
))
558 static void add_same_unmerged(const struct cache_entry
*ce
,
559 struct unpack_trees_options
*o
)
561 struct index_state
*index
= o
->src_index
;
562 int len
= ce_namelen(ce
);
563 int pos
= index_name_pos(index
, ce
->name
, len
);
566 die("programming error in a caller of mark_ce_used_same_name");
567 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
568 struct cache_entry
*next
= index
->cache
[pos
];
569 if (len
!= ce_namelen(next
) ||
570 memcmp(ce
->name
, next
->name
, len
))
572 add_entry(o
, next
, 0, 0);
573 mark_ce_used(next
, o
);
577 static int unpack_index_entry(struct cache_entry
*ce
,
578 struct unpack_trees_options
*o
)
580 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
587 if (o
->skip_unmerged
) {
588 add_entry(o
, ce
, 0, 0);
592 ret
= call_unpack_fn(src
, o
);
594 mark_ce_used_same_name(ce
, o
);
598 static int find_cache_pos(struct traverse_info
*, const struct name_entry
*);
600 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
602 struct unpack_trees_options
*o
= info
->data
;
604 if (o
->diff_index_cached
)
606 o
->cache_bottom
= bottom
;
609 static int switch_cache_bottom(struct traverse_info
*info
)
611 struct unpack_trees_options
*o
= info
->data
;
614 if (o
->diff_index_cached
)
616 ret
= o
->cache_bottom
;
617 pos
= find_cache_pos(info
->prev
, &info
->name
);
620 o
->cache_bottom
= -2 - pos
;
622 o
->cache_bottom
= o
->src_index
->cache_nr
;
626 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
628 return name_j
->oid
&& name_k
->oid
&& !oidcmp(name_j
->oid
, name_k
->oid
);
631 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
632 unsigned long df_conflicts
,
633 struct name_entry
*names
,
634 struct traverse_info
*info
)
638 struct tree_desc t
[MAX_UNPACK_TREES
];
639 void *buf
[MAX_UNPACK_TREES
];
640 struct traverse_info newinfo
;
641 struct name_entry
*p
;
649 newinfo
.pathspec
= info
->pathspec
;
651 newinfo
.pathlen
+= tree_entry_len(p
) + 1;
652 newinfo
.df_conflicts
|= df_conflicts
;
655 * Fetch the tree from the ODB for each peer directory in the
658 * For 2- and 3-way traversals, we try to avoid hitting the
659 * ODB twice for the same OID. This should yield a nice speed
660 * up in checkouts and merges when the commits are similar.
662 * We don't bother doing the full O(n^2) search for larger n,
663 * because wider traversals don't happen that often and we
664 * avoid the search setup.
666 * When 2 peer OIDs are the same, we just copy the tree
667 * descriptor data. This implicitly borrows the buffer
668 * data from the earlier cell.
670 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
671 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
673 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
676 const struct object_id
*oid
= NULL
;
679 buf
[nr_buf
++] = fill_tree_descriptor(t
+ i
, oid
);
683 bottom
= switch_cache_bottom(&newinfo
);
684 ret
= traverse_trees(n
, t
, &newinfo
);
685 restore_cache_bottom(&newinfo
, bottom
);
687 for (i
= 0; i
< nr_buf
; i
++)
694 * Compare the traverse-path to the cache entry without actually
695 * having to generate the textual representation of the traverse
698 * NOTE! This *only* compares up to the size of the traverse path
699 * itself - the caller needs to do the final check for the cache
700 * entry having more data at the end!
702 static int do_compare_entry_piecewise(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
704 int len
, pathlen
, ce_len
;
708 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
713 pathlen
= info
->pathlen
;
714 ce_len
= ce_namelen(ce
);
716 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
717 if (ce_len
< pathlen
)
721 ce_name
= ce
->name
+ pathlen
;
723 len
= tree_entry_len(n
);
724 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
727 static int do_compare_entry(const struct cache_entry
*ce
,
728 const struct traverse_info
*info
,
729 const struct name_entry
*n
)
731 int len
, pathlen
, ce_len
;
736 * If we have not precomputed the traverse path, it is quicker
737 * to avoid doing so. But if we have precomputed it,
738 * it is quicker to use the precomputed version.
740 if (!info
->traverse_path
)
741 return do_compare_entry_piecewise(ce
, info
, n
);
743 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
747 pathlen
= info
->pathlen
;
748 ce_len
= ce_namelen(ce
);
750 if (ce_len
< pathlen
)
754 ce_name
= ce
->name
+ pathlen
;
756 len
= tree_entry_len(n
);
757 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
760 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
762 int cmp
= do_compare_entry(ce
, info
, n
);
767 * Even if the beginning compared identically, the ce should
768 * compare as bigger than a directory leading up to it!
770 return ce_namelen(ce
) > traverse_path_len(info
, n
);
773 static int ce_in_traverse_path(const struct cache_entry
*ce
,
774 const struct traverse_info
*info
)
778 if (do_compare_entry(ce
, info
->prev
, &info
->name
))
781 * If ce (blob) is the same name as the path (which is a tree
782 * we will be descending into), it won't be inside it.
784 return (info
->pathlen
< ce_namelen(ce
));
787 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
, const struct name_entry
*n
, int stage
)
789 int len
= traverse_path_len(info
, n
);
790 struct cache_entry
*ce
= xcalloc(1, cache_entry_size(len
));
792 ce
->ce_mode
= create_ce_mode(n
->mode
);
793 ce
->ce_flags
= create_ce_flags(stage
);
794 ce
->ce_namelen
= len
;
795 oidcpy(&ce
->oid
, n
->oid
);
796 make_traverse_path(ce
->name
, info
, n
);
801 static int unpack_nondirectories(int n
, unsigned long mask
,
802 unsigned long dirmask
,
803 struct cache_entry
**src
,
804 const struct name_entry
*names
,
805 const struct traverse_info
*info
)
808 struct unpack_trees_options
*o
= info
->data
;
809 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
811 /* Do we have *only* directories? Nothing to do */
812 if (mask
== dirmask
&& !src
[0])
816 * Ok, we've filled in up to any potential index entry in src[0],
819 for (i
= 0; i
< n
; i
++) {
821 unsigned int bit
= 1ul << i
;
822 if (conflicts
& bit
) {
823 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
830 else if (i
+ 1 < o
->head_idx
)
832 else if (i
+ 1 > o
->head_idx
)
836 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
);
840 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
842 for (i
= 0; i
< n
; i
++) {
843 struct cache_entry
*ce
= src
[i
+ o
->merge
];
844 if (ce
!= o
->df_conflict_entry
)
850 for (i
= 0; i
< n
; i
++)
851 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
852 if (do_add_entry(o
, src
[i
], 0, 0))
858 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
860 discard_index(&o
->result
);
861 if (!o
->gently
&& !o
->exiting_early
) {
863 return error("%s", message
);
870 * The tree traversal is looking at name p. If we have a matching entry,
871 * return it. If name p is a directory in the index, do not return
872 * anything, as we will want to match it when the traversal descends into
875 static int find_cache_pos(struct traverse_info
*info
,
876 const struct name_entry
*p
)
879 struct unpack_trees_options
*o
= info
->data
;
880 struct index_state
*index
= o
->src_index
;
881 int pfxlen
= info
->pathlen
;
882 int p_len
= tree_entry_len(p
);
884 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
885 const struct cache_entry
*ce
= index
->cache
[pos
];
886 const char *ce_name
, *ce_slash
;
889 if (ce
->ce_flags
& CE_UNPACKED
) {
891 * cache_bottom entry is already unpacked, so
892 * we can never match it; don't check it
895 if (pos
== o
->cache_bottom
)
899 if (!ce_in_traverse_path(ce
, info
)) {
901 * Check if we can skip future cache checks
902 * (because we're already past all possible
903 * entries in the traverse path).
905 if (info
->traverse_path
) {
906 if (strncmp(ce
->name
, info
->traverse_path
,
912 ce_name
= ce
->name
+ pfxlen
;
913 ce_slash
= strchr(ce_name
, '/');
915 ce_len
= ce_slash
- ce_name
;
917 ce_len
= ce_namelen(ce
) - pfxlen
;
918 cmp
= name_compare(p
->path
, p_len
, ce_name
, ce_len
);
920 * Exact match; if we have a directory we need to
921 * delay returning it.
924 return ce_slash
? -2 - pos
: pos
;
926 continue; /* keep looking */
928 * ce_name sorts after p->path; could it be that we
929 * have files under p->path directory in the index?
930 * E.g. ce_name == "t-i", and p->path == "t"; we may
931 * have "t/a" in the index.
933 if (p_len
< ce_len
&& !memcmp(ce_name
, p
->path
, p_len
) &&
934 ce_name
[p_len
] < '/')
935 continue; /* keep looking */
941 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
942 const struct name_entry
*p
)
944 int pos
= find_cache_pos(info
, p
);
945 struct unpack_trees_options
*o
= info
->data
;
948 return o
->src_index
->cache
[pos
];
953 static void debug_path(struct traverse_info
*info
)
956 debug_path(info
->prev
);
957 if (*info
->prev
->name
.path
)
960 printf("%s", info
->name
.path
);
963 static void debug_name_entry(int i
, struct name_entry
*n
)
965 printf("ent#%d %06o %s\n", i
,
966 n
->path
? n
->mode
: 0,
967 n
->path
? n
->path
: "(missing)");
970 static void debug_unpack_callback(int n
,
972 unsigned long dirmask
,
973 struct name_entry
*names
,
974 struct traverse_info
*info
)
977 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
981 for (i
= 0; i
< n
; i
++)
982 debug_name_entry(i
, names
+ i
);
985 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
987 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
988 struct unpack_trees_options
*o
= info
->data
;
989 const struct name_entry
*p
= names
;
991 /* Find first entry with a real name (we could use "mask" too) */
996 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
998 /* Are we supposed to look at the index too? */
1002 struct cache_entry
*ce
;
1004 if (o
->diff_index_cached
)
1005 ce
= next_cache_entry(o
);
1007 ce
= find_cache_entry(info
, p
);
1011 cmp
= compare_entry(ce
, info
, p
);
1013 if (unpack_index_entry(ce
, o
) < 0)
1014 return unpack_failed(o
, NULL
);
1020 * If we skip unmerged index
1021 * entries, we'll skip this
1022 * entry *and* the tree
1023 * entries associated with it!
1025 if (o
->skip_unmerged
) {
1026 add_same_unmerged(ce
, o
);
1036 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
1039 if (o
->merge
&& src
[0]) {
1040 if (ce_stage(src
[0]))
1041 mark_ce_used_same_name(src
[0], o
);
1043 mark_ce_used(src
[0], o
);
1046 /* Now handle any directories.. */
1048 /* special case: "diff-index --cached" looking at a tree */
1049 if (o
->diff_index_cached
&&
1050 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1052 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1055 * Everything under the name matches; skip the
1056 * entire hierarchy. diff_index_cached codepath
1057 * special cases D/F conflicts in such a way that
1058 * it does not do any look-ahead, so this is safe.
1061 o
->cache_bottom
+= matches
;
1066 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1075 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1076 struct strbuf
*prefix
,
1077 int select_mask
, int clear_mask
,
1078 struct exclude_list
*el
, int defval
);
1080 /* Whole directory matching */
1081 static int clear_ce_flags_dir(struct cache_entry
**cache
, int nr
,
1082 struct strbuf
*prefix
,
1084 int select_mask
, int clear_mask
,
1085 struct exclude_list
*el
, int defval
)
1087 struct cache_entry
**cache_end
;
1089 int ret
= is_excluded_from_list(prefix
->buf
, prefix
->len
,
1090 basename
, &dtype
, el
, &the_index
);
1093 strbuf_addch(prefix
, '/');
1095 /* If undecided, use matching result of parent dir in defval */
1099 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1100 struct cache_entry
*ce
= *cache_end
;
1101 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1106 * TODO: check el, if there are no patterns that may conflict
1107 * with ret (iow, we know in advance the incl/excl
1108 * decision for the entire directory), clear flag here without
1109 * calling clear_ce_flags_1(). That function will call
1110 * the expensive is_excluded_from_list() on every entry.
1112 rc
= clear_ce_flags_1(cache
, cache_end
- cache
,
1114 select_mask
, clear_mask
,
1116 strbuf_setlen(prefix
, prefix
->len
- 1);
1121 * Traverse the index, find every entry that matches according to
1122 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
1123 * number of traversed entries.
1125 * If select_mask is non-zero, only entries whose ce_flags has on of
1126 * those bits enabled are traversed.
1128 * cache : pointer to an index entry
1129 * prefix_len : an offset to its path
1131 * The current path ("prefix") including the trailing '/' is
1132 * cache[0]->name[0..(prefix_len-1)]
1133 * Top level path has prefix_len zero.
1135 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1136 struct strbuf
*prefix
,
1137 int select_mask
, int clear_mask
,
1138 struct exclude_list
*el
, int defval
)
1140 struct cache_entry
**cache_end
= cache
+ nr
;
1143 * Process all entries that have the given prefix and meet
1144 * select_mask condition
1146 while(cache
!= cache_end
) {
1147 struct cache_entry
*ce
= *cache
;
1148 const char *name
, *slash
;
1149 int len
, dtype
, ret
;
1151 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1156 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1159 name
= ce
->name
+ prefix
->len
;
1160 slash
= strchr(name
, '/');
1162 /* If it's a directory, try whole directory match first */
1167 strbuf_add(prefix
, name
, len
);
1169 processed
= clear_ce_flags_dir(cache
, cache_end
- cache
,
1171 prefix
->buf
+ prefix
->len
- len
,
1172 select_mask
, clear_mask
,
1175 /* clear_c_f_dir eats a whole dir already? */
1178 strbuf_setlen(prefix
, prefix
->len
- len
);
1182 strbuf_addch(prefix
, '/');
1183 cache
+= clear_ce_flags_1(cache
, cache_end
- cache
,
1185 select_mask
, clear_mask
, el
, defval
);
1186 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1191 dtype
= ce_to_dtype(ce
);
1192 ret
= is_excluded_from_list(ce
->name
, ce_namelen(ce
),
1193 name
, &dtype
, el
, &the_index
);
1197 ce
->ce_flags
&= ~clear_mask
;
1200 return nr
- (cache_end
- cache
);
1203 static int clear_ce_flags(struct cache_entry
**cache
, int nr
,
1204 int select_mask
, int clear_mask
,
1205 struct exclude_list
*el
)
1207 static struct strbuf prefix
= STRBUF_INIT
;
1209 strbuf_reset(&prefix
);
1211 return clear_ce_flags_1(cache
, nr
,
1213 select_mask
, clear_mask
,
1218 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1220 static void mark_new_skip_worktree(struct exclude_list
*el
,
1221 struct index_state
*the_index
,
1222 int select_flag
, int skip_wt_flag
)
1227 * 1. Pretend the narrowest worktree: only unmerged entries
1230 for (i
= 0; i
< the_index
->cache_nr
; i
++) {
1231 struct cache_entry
*ce
= the_index
->cache
[i
];
1233 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1237 ce
->ce_flags
|= skip_wt_flag
;
1239 ce
->ce_flags
&= ~skip_wt_flag
;
1243 * 2. Widen worktree according to sparse-checkout file.
1244 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1246 clear_ce_flags(the_index
->cache
, the_index
->cache_nr
,
1247 select_flag
, skip_wt_flag
, el
);
1250 static int verify_absent(const struct cache_entry
*,
1251 enum unpack_trees_error_types
,
1252 struct unpack_trees_options
*);
1254 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1255 * resulting index, -2 on failure to reflect the changes to the work tree.
1257 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1259 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1262 static struct cache_entry
*dfc
;
1263 struct exclude_list el
;
1265 if (len
> MAX_UNPACK_TREES
)
1266 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1268 memset(&el
, 0, sizeof(el
));
1269 if (!core_apply_sparse_checkout
|| !o
->update
)
1270 o
->skip_sparse_checkout
= 1;
1271 if (!o
->skip_sparse_checkout
) {
1272 char *sparse
= git_pathdup("info/sparse-checkout");
1273 if (add_excludes_from_file_to_list(sparse
, "", 0, &el
, NULL
) < 0)
1274 o
->skip_sparse_checkout
= 1;
1280 memset(&o
->result
, 0, sizeof(o
->result
));
1281 o
->result
.initialized
= 1;
1282 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1283 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1284 o
->result
.version
= o
->src_index
->version
;
1285 o
->result
.split_index
= o
->src_index
->split_index
;
1286 if (o
->result
.split_index
)
1287 o
->result
.split_index
->refcount
++;
1288 hashcpy(o
->result
.sha1
, o
->src_index
->sha1
);
1289 o
->merge_size
= len
;
1290 mark_all_ce_unused(o
->src_index
);
1293 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1295 if (!o
->skip_sparse_checkout
)
1296 mark_new_skip_worktree(o
->el
, o
->src_index
, 0, CE_NEW_SKIP_WORKTREE
);
1299 dfc
= xcalloc(1, cache_entry_size(0));
1300 o
->df_conflict_entry
= dfc
;
1303 const char *prefix
= o
->prefix
? o
->prefix
: "";
1304 struct traverse_info info
;
1306 setup_traverse_info(&info
, prefix
);
1307 info
.fn
= unpack_callback
;
1309 info
.show_all_errors
= o
->show_all_errors
;
1310 info
.pathspec
= o
->pathspec
;
1314 * Unpack existing index entries that sort before the
1315 * prefix the tree is spliced into. Note that o->merge
1316 * is always true in this case.
1319 struct cache_entry
*ce
= next_cache_entry(o
);
1322 if (ce_in_traverse_path(ce
, &info
))
1324 if (unpack_index_entry(ce
, o
) < 0)
1329 if (traverse_trees(len
, t
, &info
) < 0)
1333 /* Any left-over entries in the index? */
1336 struct cache_entry
*ce
= next_cache_entry(o
);
1339 if (unpack_index_entry(ce
, o
) < 0)
1343 mark_all_ce_unused(o
->src_index
);
1345 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1346 ret
= unpack_failed(o
, "Merge requires file-level merging");
1350 if (!o
->skip_sparse_checkout
) {
1351 int empty_worktree
= 1;
1354 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1355 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1356 * so apply_sparse_checkout() won't attempt to remove it from worktree
1358 mark_new_skip_worktree(o
->el
, &o
->result
, CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1361 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1362 struct cache_entry
*ce
= o
->result
.cache
[i
];
1365 * Entries marked with CE_ADDED in merged_entry() do not have
1366 * verify_absent() check (the check is effectively disabled
1367 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1369 * Do the real check now because we have had
1370 * correct CE_NEW_SKIP_WORKTREE
1372 if (ce
->ce_flags
& CE_ADDED
&&
1373 verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1374 if (!o
->show_all_errors
)
1379 if (apply_sparse_checkout(&o
->result
, ce
, o
)) {
1380 if (!o
->show_all_errors
)
1384 if (!ce_skip_worktree(ce
))
1391 * Sparse checkout is meant to narrow down checkout area
1392 * but it does not make sense to narrow down to empty working
1393 * tree. This is usually a mistake in sparse checkout rules.
1394 * Do not allow users to do that.
1396 if (o
->result
.cache_nr
&& empty_worktree
) {
1397 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1402 o
->src_index
= NULL
;
1403 ret
= check_updates(o
) ? (-2) : 0;
1406 if (!o
->result
.cache_tree
)
1407 o
->result
.cache_tree
= cache_tree();
1408 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1409 cache_tree_update(&o
->result
,
1413 move_index_extensions(&o
->result
, o
->dst_index
);
1414 discard_index(o
->dst_index
);
1415 *o
->dst_index
= o
->result
;
1417 discard_index(&o
->result
);
1421 clear_exclude_list(&el
);
1425 if (o
->show_all_errors
)
1426 display_error_msgs(o
);
1427 mark_all_ce_unused(o
->src_index
);
1428 ret
= unpack_failed(o
, NULL
);
1429 if (o
->exiting_early
)
1434 /* Here come the merge functions */
1436 static int reject_merge(const struct cache_entry
*ce
,
1437 struct unpack_trees_options
*o
)
1439 return o
->gently
? -1 :
1440 add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1443 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1449 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1451 return a
->ce_mode
== b
->ce_mode
&&
1452 !oidcmp(&a
->oid
, &b
->oid
);
1457 * When a CE gets turned into an unmerged entry, we
1458 * want it to be up-to-date
1460 static int verify_uptodate_1(const struct cache_entry
*ce
,
1461 struct unpack_trees_options
*o
,
1462 enum unpack_trees_error_types error_type
)
1470 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1471 * if this entry is truly up-to-date because this file may be
1474 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1475 ; /* keep checking */
1476 else if (o
->reset
|| ce_uptodate(ce
))
1479 if (!lstat(ce
->name
, &st
)) {
1480 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1481 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1483 if (submodule_from_ce(ce
)) {
1484 int r
= check_submodule_move_head(ce
,
1485 "HEAD", oid_to_hex(&ce
->oid
), o
);
1487 return o
->gently
? -1 :
1488 add_rejected_path(o
, error_type
, ce
->name
);
1495 * Historic default policy was to allow submodule to be out
1496 * of sync wrt the superproject index. If the submodule was
1497 * not considered interesting above, we don't care here.
1499 if (S_ISGITLINK(ce
->ce_mode
))
1504 if (errno
== ENOENT
)
1506 return o
->gently
? -1 :
1507 add_rejected_path(o
, error_type
, ce
->name
);
1510 static int verify_uptodate(const struct cache_entry
*ce
,
1511 struct unpack_trees_options
*o
)
1513 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1515 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1518 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1519 struct unpack_trees_options
*o
)
1521 return verify_uptodate_1(ce
, o
, ERROR_SPARSE_NOT_UPTODATE_FILE
);
1524 static void invalidate_ce_path(const struct cache_entry
*ce
,
1525 struct unpack_trees_options
*o
)
1529 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1530 untracked_cache_invalidate_path(o
->src_index
, ce
->name
);
1534 * Check that checking out ce->sha1 in subdir ce->name is not
1535 * going to overwrite any working files.
1537 * Currently, git does not checkout subprojects during a superproject
1538 * checkout, so it is not going to overwrite anything.
1540 static int verify_clean_submodule(const char *old_sha1
,
1541 const struct cache_entry
*ce
,
1542 enum unpack_trees_error_types error_type
,
1543 struct unpack_trees_options
*o
)
1545 if (!submodule_from_ce(ce
))
1548 return check_submodule_move_head(ce
, old_sha1
,
1549 oid_to_hex(&ce
->oid
), o
);
1552 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1553 enum unpack_trees_error_types error_type
,
1554 struct unpack_trees_options
*o
)
1557 * we are about to extract "ce->name"; we would not want to lose
1558 * anything in the existing directory there.
1562 struct dir_struct d
;
1566 if (S_ISGITLINK(ce
->ce_mode
)) {
1567 unsigned char sha1
[20];
1568 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", sha1
);
1570 * If we are not going to update the submodule, then
1573 if (!sub_head
&& !hashcmp(sha1
, ce
->oid
.hash
))
1575 return verify_clean_submodule(sub_head
? NULL
: sha1_to_hex(sha1
),
1580 * First let's make sure we do not have a local modification
1581 * in that directory.
1583 namelen
= ce_namelen(ce
);
1584 for (i
= locate_in_src_index(ce
, o
);
1585 i
< o
->src_index
->cache_nr
;
1587 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1588 int len
= ce_namelen(ce2
);
1589 if (len
< namelen
||
1590 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1591 ce2
->name
[namelen
] != '/')
1594 * ce2->name is an entry in the subdirectory to be
1597 if (!ce_stage(ce2
)) {
1598 if (verify_uptodate(ce2
, o
))
1600 add_entry(o
, ce2
, CE_REMOVE
, 0);
1601 mark_ce_used(ce2
, o
);
1607 * Then we need to make sure that we do not lose a locally
1608 * present file that is not ignored.
1610 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
1612 memset(&d
, 0, sizeof(d
));
1614 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
1615 i
= read_directory(&d
, &the_index
, pathbuf
, namelen
+1, NULL
);
1617 return o
->gently
? -1 :
1618 add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
1624 * This gets called when there was no index entry for the tree entry 'dst',
1625 * but we found a file in the working tree that 'lstat()' said was fine,
1626 * and we're on a case-insensitive filesystem.
1628 * See if we can find a case-insensitive match in the index that also
1629 * matches the stat information, and assume it's that other file!
1631 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
1633 const struct cache_entry
*src
;
1635 src
= index_file_exists(o
->src_index
, name
, len
, 1);
1636 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
1639 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
1640 const struct cache_entry
*ce
, struct stat
*st
,
1641 enum unpack_trees_error_types error_type
,
1642 struct unpack_trees_options
*o
)
1644 const struct cache_entry
*result
;
1647 * It may be that the 'lstat()' succeeded even though
1648 * target 'ce' was absent, because there is an old
1649 * entry that is different only in case..
1651 * Ignore that lstat() if it matches.
1653 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
1657 is_excluded(o
->dir
, &the_index
, name
, &dtype
))
1659 * ce->name is explicitly excluded, so it is Ok to
1663 if (S_ISDIR(st
->st_mode
)) {
1665 * We are checking out path "foo" and
1666 * found "foo/." in the working tree.
1667 * This is tricky -- if we have modified
1668 * files that are in "foo/" we would lose
1671 if (verify_clean_subdirectory(ce
, error_type
, o
) < 0)
1677 * The previous round may already have decided to
1678 * delete this path, which is in a subdirectory that
1679 * is being replaced with a blob.
1681 result
= index_file_exists(&o
->result
, name
, len
, 0);
1683 if (result
->ce_flags
& CE_REMOVE
)
1687 return o
->gently
? -1 :
1688 add_rejected_path(o
, error_type
, name
);
1692 * We do not want to remove or overwrite a working tree file that
1693 * is not tracked, unless it is ignored.
1695 static int verify_absent_1(const struct cache_entry
*ce
,
1696 enum unpack_trees_error_types error_type
,
1697 struct unpack_trees_options
*o
)
1702 if (o
->index_only
|| o
->reset
|| !o
->update
)
1705 len
= check_leading_path(ce
->name
, ce_namelen(ce
));
1712 path
= xmemdupz(ce
->name
, len
);
1713 if (lstat(path
, &st
))
1714 ret
= error_errno("cannot stat '%s'", path
);
1716 if (submodule_from_ce(ce
))
1717 ret
= check_submodule_move_head(ce
,
1718 oid_to_hex(&ce
->oid
),
1721 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
1722 &st
, error_type
, o
);
1726 } else if (lstat(ce
->name
, &st
)) {
1727 if (errno
!= ENOENT
)
1728 return error_errno("cannot stat '%s'", ce
->name
);
1731 if (submodule_from_ce(ce
))
1732 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
1735 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
1736 ce_to_dtype(ce
), ce
, &st
,
1741 static int verify_absent(const struct cache_entry
*ce
,
1742 enum unpack_trees_error_types error_type
,
1743 struct unpack_trees_options
*o
)
1745 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1747 return verify_absent_1(ce
, error_type
, o
);
1750 static int verify_absent_sparse(const struct cache_entry
*ce
,
1751 enum unpack_trees_error_types error_type
,
1752 struct unpack_trees_options
*o
)
1754 enum unpack_trees_error_types orphaned_error
= error_type
;
1755 if (orphaned_error
== ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
)
1756 orphaned_error
= ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
;
1758 return verify_absent_1(ce
, orphaned_error
, o
);
1761 static int merged_entry(const struct cache_entry
*ce
,
1762 const struct cache_entry
*old
,
1763 struct unpack_trees_options
*o
)
1765 int update
= CE_UPDATE
;
1766 struct cache_entry
*merge
= dup_entry(ce
);
1770 * New index entries. In sparse checkout, the following
1771 * verify_absent() will be delayed until after
1772 * traverse_trees() finishes in unpack_trees(), then:
1774 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1775 * - verify_absent() be called again, this time with
1776 * correct CE_NEW_SKIP_WORKTREE
1778 * verify_absent() call here does nothing in sparse
1779 * checkout (i.e. o->skip_sparse_checkout == 0)
1782 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
1784 if (verify_absent(merge
,
1785 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1789 invalidate_ce_path(merge
, o
);
1791 if (submodule_from_ce(ce
)) {
1792 int ret
= check_submodule_move_head(ce
, NULL
,
1793 oid_to_hex(&ce
->oid
),
1799 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
1801 * See if we can re-use the old CE directly?
1802 * That way we get the uptodate stat info.
1804 * This also removes the UPDATE flag on a match; otherwise
1805 * we will end up overwriting local changes in the work tree.
1807 if (same(old
, merge
)) {
1808 copy_cache_entry(merge
, old
);
1811 if (verify_uptodate(old
, o
)) {
1815 /* Migrate old flags over */
1816 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1817 invalidate_ce_path(old
, o
);
1820 if (submodule_from_ce(ce
)) {
1821 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
1822 oid_to_hex(&ce
->oid
),
1829 * Previously unmerged entry left as an existence
1830 * marker by read_index_unmerged();
1832 invalidate_ce_path(old
, o
);
1835 do_add_entry(o
, merge
, update
, CE_STAGEMASK
);
1839 static int deleted_entry(const struct cache_entry
*ce
,
1840 const struct cache_entry
*old
,
1841 struct unpack_trees_options
*o
)
1843 /* Did it exist in the index? */
1845 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1849 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
1851 add_entry(o
, ce
, CE_REMOVE
, 0);
1852 invalidate_ce_path(ce
, o
);
1856 static int keep_entry(const struct cache_entry
*ce
,
1857 struct unpack_trees_options
*o
)
1859 add_entry(o
, ce
, 0, 0);
1864 static void show_stage_entry(FILE *o
,
1865 const char *label
, const struct cache_entry
*ce
)
1868 fprintf(o
, "%s (missing)\n", label
);
1870 fprintf(o
, "%s%06o %s %d\t%s\n",
1873 oid_to_hex(&ce
->oid
),
1879 int threeway_merge(const struct cache_entry
* const *stages
,
1880 struct unpack_trees_options
*o
)
1882 const struct cache_entry
*index
;
1883 const struct cache_entry
*head
;
1884 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
1887 int remote_match
= 0;
1889 int df_conflict_head
= 0;
1890 int df_conflict_remote
= 0;
1892 int any_anc_missing
= 0;
1893 int no_anc_exists
= 1;
1896 for (i
= 1; i
< o
->head_idx
; i
++) {
1897 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
1898 any_anc_missing
= 1;
1904 head
= stages
[o
->head_idx
];
1906 if (head
== o
->df_conflict_entry
) {
1907 df_conflict_head
= 1;
1911 if (remote
== o
->df_conflict_entry
) {
1912 df_conflict_remote
= 1;
1917 * First, if there's a #16 situation, note that to prevent #13
1920 if (!same(remote
, head
)) {
1921 for (i
= 1; i
< o
->head_idx
; i
++) {
1922 if (same(stages
[i
], head
)) {
1925 if (same(stages
[i
], remote
)) {
1932 * We start with cases where the index is allowed to match
1933 * something other than the head: #14(ALT) and #2ALT, where it
1934 * is permitted to match the result instead.
1936 /* #14, #14ALT, #2ALT */
1937 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
1938 if (index
&& !same(index
, remote
) && !same(index
, head
))
1939 return reject_merge(index
, o
);
1940 return merged_entry(remote
, index
, o
);
1943 * If we have an entry in the index cache, then we want to
1944 * make sure that it matches head.
1946 if (index
&& !same(index
, head
))
1947 return reject_merge(index
, o
);
1951 if (same(head
, remote
))
1952 return merged_entry(head
, index
, o
);
1954 if (!df_conflict_remote
&& remote_match
&& !head_match
)
1955 return merged_entry(head
, index
, o
);
1959 if (!head
&& !remote
&& any_anc_missing
)
1963 * Under the "aggressive" rule, we resolve mostly trivial
1964 * cases that we historically had git-merge-one-file resolve.
1966 if (o
->aggressive
) {
1967 int head_deleted
= !head
;
1968 int remote_deleted
= !remote
;
1969 const struct cache_entry
*ce
= NULL
;
1978 for (i
= 1; i
< o
->head_idx
; i
++) {
1979 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1988 * Deleted in one and unchanged in the other.
1990 if ((head_deleted
&& remote_deleted
) ||
1991 (head_deleted
&& remote
&& remote_match
) ||
1992 (remote_deleted
&& head
&& head_match
)) {
1994 return deleted_entry(index
, index
, o
);
1995 if (ce
&& !head_deleted
) {
1996 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
2002 * Added in both, identically.
2004 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
2005 return merged_entry(head
, index
, o
);
2009 /* Below are "no merge" cases, which require that the index be
2010 * up-to-date to avoid the files getting overwritten with
2011 * conflict resolution files.
2014 if (verify_uptodate(index
, o
))
2018 o
->nontrivial_merge
= 1;
2020 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2022 if (!head_match
|| !remote_match
) {
2023 for (i
= 1; i
< o
->head_idx
; i
++) {
2024 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2025 keep_entry(stages
[i
], o
);
2033 fprintf(stderr
, "read-tree: warning #16 detected\n");
2034 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2035 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2038 if (head
) { count
+= keep_entry(head
, o
); }
2039 if (remote
) { count
+= keep_entry(remote
, o
); }
2046 * The rule is to "carry forward" what is in the index without losing
2047 * information across a "fast-forward", favoring a successful merge
2048 * over a merge failure when it makes sense. For details of the
2049 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2052 int twoway_merge(const struct cache_entry
* const *src
,
2053 struct unpack_trees_options
*o
)
2055 const struct cache_entry
*current
= src
[0];
2056 const struct cache_entry
*oldtree
= src
[1];
2057 const struct cache_entry
*newtree
= src
[2];
2059 if (o
->merge_size
!= 2)
2060 return error("Cannot do a twoway merge of %d trees",
2063 if (oldtree
== o
->df_conflict_entry
)
2065 if (newtree
== o
->df_conflict_entry
)
2069 if (current
->ce_flags
& CE_CONFLICTED
) {
2070 if (same(oldtree
, newtree
) || o
->reset
) {
2072 return deleted_entry(current
, current
, o
);
2074 return merged_entry(newtree
, current
, o
);
2076 return reject_merge(current
, o
);
2077 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2078 (!oldtree
&& newtree
&&
2079 same(current
, newtree
)) || /* 6 and 7 */
2080 (oldtree
&& newtree
&&
2081 same(oldtree
, newtree
)) || /* 14 and 15 */
2082 (oldtree
&& newtree
&&
2083 !same(oldtree
, newtree
) && /* 18 and 19 */
2084 same(current
, newtree
))) {
2085 return keep_entry(current
, o
);
2086 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2088 return deleted_entry(oldtree
, current
, o
);
2089 } else if (oldtree
&& newtree
&&
2090 same(current
, oldtree
) && !same(current
, newtree
)) {
2092 return merged_entry(newtree
, current
, o
);
2094 return reject_merge(current
, o
);
2097 if (oldtree
&& !o
->initial_checkout
) {
2099 * deletion of the path was staged;
2101 if (same(oldtree
, newtree
))
2103 return reject_merge(oldtree
, o
);
2105 return merged_entry(newtree
, current
, o
);
2107 return deleted_entry(oldtree
, current
, o
);
2113 * Keep the index entries at stage0, collapse stage1 but make sure
2114 * stage0 does not have anything there.
2116 int bind_merge(const struct cache_entry
* const *src
,
2117 struct unpack_trees_options
*o
)
2119 const struct cache_entry
*old
= src
[0];
2120 const struct cache_entry
*a
= src
[1];
2122 if (o
->merge_size
!= 1)
2123 return error("Cannot do a bind merge of %d trees",
2126 return o
->gently
? -1 :
2127 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2128 super_prefixed(a
->name
),
2129 super_prefixed(old
->name
));
2131 return keep_entry(old
, o
);
2133 return merged_entry(a
, NULL
, o
);
2140 * - take the stat information from stage0, take the data from stage1
2142 int oneway_merge(const struct cache_entry
* const *src
,
2143 struct unpack_trees_options
*o
)
2145 const struct cache_entry
*old
= src
[0];
2146 const struct cache_entry
*a
= src
[1];
2148 if (o
->merge_size
!= 1)
2149 return error("Cannot do a oneway merge of %d trees",
2152 if (!a
|| a
== o
->df_conflict_entry
)
2153 return deleted_entry(old
, old
, o
);
2155 if (old
&& same(old
, a
)) {
2157 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
)) {
2159 if (lstat(old
->name
, &st
) ||
2160 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2161 update
|= CE_UPDATE
;
2163 add_entry(o
, old
, update
, 0);
2166 return merged_entry(a
, old
, o
);