1 #define NO_THE_INDEX_COMPATIBILITY_MACROS
7 #include "cache-tree.h"
8 #include "unpack-trees.h"
12 #include "split-index.h"
14 #include "submodule.h"
15 #include "submodule-config.h"
18 * Error messages expected by scripts out of plumbing commands such as
19 * read-tree. Non-scripted Porcelain is not required to use these messages
20 * and in fact are encouraged to reword them to better suit their particular
21 * situation better. See how "git checkout" and "git merge" replaces
22 * them using setup_unpack_trees_porcelain(), for example.
24 static const char *unpack_plumbing_errors
[NB_UNPACK_TREES_ERROR_TYPES
] = {
25 /* ERROR_WOULD_OVERWRITE */
26 "Entry '%s' would be overwritten by merge. Cannot merge.",
28 /* ERROR_NOT_UPTODATE_FILE */
29 "Entry '%s' not uptodate. Cannot merge.",
31 /* ERROR_NOT_UPTODATE_DIR */
32 "Updating '%s' would lose untracked files in it",
34 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
35 "Untracked working tree file '%s' would be overwritten by merge.",
37 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
38 "Untracked working tree file '%s' would be removed by merge.",
40 /* ERROR_BIND_OVERLAP */
41 "Entry '%s' overlaps with '%s'. Cannot bind.",
43 /* ERROR_SPARSE_NOT_UPTODATE_FILE */
44 "Entry '%s' not uptodate. Cannot update sparse checkout.",
46 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
47 "Working tree file '%s' would be overwritten by sparse checkout update.",
49 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
50 "Working tree file '%s' would be removed by sparse checkout update.",
52 /* ERROR_WOULD_LOSE_SUBMODULE */
53 "Submodule '%s' cannot checkout new HEAD.",
56 #define ERRORMSG(o,type) \
57 ( ((o) && (o)->msgs[(type)]) \
58 ? ((o)->msgs[(type)]) \
59 : (unpack_plumbing_errors[(type)]) )
61 static const char *super_prefixed(const char *path
)
64 * It is necessary and sufficient to have two static buffers
65 * here, as the return value of this function is fed to
66 * error() using the unpack_*_errors[] templates we see above.
68 static struct strbuf buf
[2] = {STRBUF_INIT
, STRBUF_INIT
};
69 static int super_prefix_len
= -1;
70 static unsigned idx
= ARRAY_SIZE(buf
) - 1;
72 if (super_prefix_len
< 0) {
73 const char *super_prefix
= get_super_prefix();
78 for (i
= 0; i
< ARRAY_SIZE(buf
); i
++)
79 strbuf_addstr(&buf
[i
], super_prefix
);
80 super_prefix_len
= buf
[0].len
;
84 if (!super_prefix_len
)
87 if (++idx
>= ARRAY_SIZE(buf
))
90 strbuf_setlen(&buf
[idx
], super_prefix_len
);
91 strbuf_addstr(&buf
[idx
], path
);
96 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
100 const char **msgs
= opts
->msgs
;
103 if (!strcmp(cmd
, "checkout"))
104 msg
= advice_commit_before_merge
105 ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
106 "Please commit your changes or stash them before you switch branches.")
107 : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
108 else if (!strcmp(cmd
, "merge"))
109 msg
= advice_commit_before_merge
110 ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
111 "Please commit your changes or stash them before you merge.")
112 : _("Your local changes to the following files would be overwritten by merge:\n%%s");
114 msg
= advice_commit_before_merge
115 ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
116 "Please commit your changes or stash them before you %s.")
117 : _("Your local changes to the following files would be overwritten by %s:\n%%s");
118 msgs
[ERROR_WOULD_OVERWRITE
] = msgs
[ERROR_NOT_UPTODATE_FILE
] =
119 xstrfmt(msg
, cmd
, cmd
);
121 msgs
[ERROR_NOT_UPTODATE_DIR
] =
122 _("Updating the following directories would lose untracked files in them:\n%s");
124 if (!strcmp(cmd
, "checkout"))
125 msg
= advice_commit_before_merge
126 ? _("The following untracked working tree files would be removed by checkout:\n%%s"
127 "Please move or remove them before you switch branches.")
128 : _("The following untracked working tree files would be removed by checkout:\n%%s");
129 else if (!strcmp(cmd
, "merge"))
130 msg
= advice_commit_before_merge
131 ? _("The following untracked working tree files would be removed by merge:\n%%s"
132 "Please move or remove them before you merge.")
133 : _("The following untracked working tree files would be removed by merge:\n%%s");
135 msg
= advice_commit_before_merge
136 ? _("The following untracked working tree files would be removed by %s:\n%%s"
137 "Please move or remove them before you %s.")
138 : _("The following untracked working tree files would be removed by %s:\n%%s");
139 msgs
[ERROR_WOULD_LOSE_UNTRACKED_REMOVED
] = xstrfmt(msg
, cmd
, cmd
);
141 if (!strcmp(cmd
, "checkout"))
142 msg
= advice_commit_before_merge
143 ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
144 "Please move or remove them before you switch branches.")
145 : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
146 else if (!strcmp(cmd
, "merge"))
147 msg
= advice_commit_before_merge
148 ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
149 "Please move or remove them before you merge.")
150 : _("The following untracked working tree files would be overwritten by merge:\n%%s");
152 msg
= advice_commit_before_merge
153 ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
154 "Please move or remove them before you %s.")
155 : _("The following untracked working tree files would be overwritten by %s:\n%%s");
156 msgs
[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
] = xstrfmt(msg
, cmd
, cmd
);
159 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
160 * cannot easily display it as a list.
162 msgs
[ERROR_BIND_OVERLAP
] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
164 msgs
[ERROR_SPARSE_NOT_UPTODATE_FILE
] =
165 _("Cannot update sparse checkout: the following entries are not up-to-date:\n%s");
166 msgs
[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
] =
167 _("The following working tree files would be overwritten by sparse checkout update:\n%s");
168 msgs
[ERROR_WOULD_LOSE_ORPHANED_REMOVED
] =
169 _("The following working tree files would be removed by sparse checkout update:\n%s");
170 msgs
[ERROR_WOULD_LOSE_SUBMODULE
] =
171 _("Cannot update submodule:\n%s");
173 opts
->show_all_errors
= 1;
174 /* rejected paths may not have a static buffer */
175 for (i
= 0; i
< ARRAY_SIZE(opts
->unpack_rejects
); i
++)
176 opts
->unpack_rejects
[i
].strdup_strings
= 1;
179 static int do_add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
180 unsigned int set
, unsigned int clear
)
187 ce
->ce_flags
= (ce
->ce_flags
& ~clear
) | set
;
188 return add_index_entry(&o
->result
, ce
,
189 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
192 static struct cache_entry
*dup_entry(const struct cache_entry
*ce
)
194 unsigned int size
= ce_size(ce
);
195 struct cache_entry
*new = xmalloc(size
);
197 memcpy(new, ce
, size
);
201 static void add_entry(struct unpack_trees_options
*o
,
202 const struct cache_entry
*ce
,
203 unsigned int set
, unsigned int clear
)
205 do_add_entry(o
, dup_entry(ce
), set
, clear
);
209 * add error messages on path <path>
210 * corresponding to the type <e> with the message <msg>
211 * indicating if it should be display in porcelain or not
213 static int add_rejected_path(struct unpack_trees_options
*o
,
214 enum unpack_trees_error_types e
,
217 if (!o
->show_all_errors
)
218 return error(ERRORMSG(o
, e
), super_prefixed(path
));
221 * Otherwise, insert in a list for future display by
222 * display_error_msgs()
224 string_list_append(&o
->unpack_rejects
[e
], path
);
229 * display all the error messages stored in a nice way
231 static void display_error_msgs(struct unpack_trees_options
*o
)
234 int something_displayed
= 0;
235 for (e
= 0; e
< NB_UNPACK_TREES_ERROR_TYPES
; e
++) {
236 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
237 if (rejects
->nr
> 0) {
238 struct strbuf path
= STRBUF_INIT
;
239 something_displayed
= 1;
240 for (i
= 0; i
< rejects
->nr
; i
++)
241 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
242 error(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
243 strbuf_release(&path
);
245 string_list_clear(rejects
, 0);
247 if (something_displayed
)
248 fprintf(stderr
, _("Aborting\n"));
251 static int check_submodule_move_head(const struct cache_entry
*ce
,
254 struct unpack_trees_options
*o
)
256 unsigned flags
= SUBMODULE_MOVE_HEAD_DRY_RUN
;
257 const struct submodule
*sub
= submodule_from_ce(ce
);
263 flags
|= SUBMODULE_MOVE_HEAD_FORCE
;
265 if (submodule_move_head(ce
->name
, old_id
, new_id
, flags
))
266 return o
->gently
? -1 :
267 add_rejected_path(o
, ERROR_WOULD_LOSE_SUBMODULE
, ce
->name
);
271 static void reload_gitmodules_file(struct index_state
*index
,
272 struct checkout
*state
)
275 for (i
= 0; i
< index
->cache_nr
; i
++) {
276 struct cache_entry
*ce
= index
->cache
[i
];
277 if (ce
->ce_flags
& CE_UPDATE
) {
278 int r
= strcmp(ce
->name
, GITMODULES_FILE
);
283 checkout_entry(ce
, state
, NULL
);
292 * Unlink the last component and schedule the leading directories for
293 * removal, such that empty directories get removed.
295 static void unlink_entry(const struct cache_entry
*ce
)
297 const struct submodule
*sub
= submodule_from_ce(ce
);
299 /* state.force is set at the caller. */
300 submodule_move_head(ce
->name
, "HEAD", NULL
,
301 SUBMODULE_MOVE_HEAD_FORCE
);
303 if (!check_leading_path(ce
->name
, ce_namelen(ce
)))
305 if (remove_or_warn(ce
->ce_mode
, ce
->name
))
307 schedule_dir_for_removal(ce
->name
, ce_namelen(ce
));
310 static struct progress
*get_progress(struct unpack_trees_options
*o
)
312 unsigned cnt
= 0, total
= 0;
313 struct index_state
*index
= &o
->result
;
315 if (!o
->update
|| !o
->verbose_update
)
318 for (; cnt
< index
->cache_nr
; cnt
++) {
319 const struct cache_entry
*ce
= index
->cache
[cnt
];
320 if (ce
->ce_flags
& (CE_UPDATE
| CE_WT_REMOVE
))
324 return start_progress_delay(_("Checking out files"),
328 static int check_updates(struct unpack_trees_options
*o
)
332 struct progress
*progress
= NULL
;
333 struct index_state
*index
= &o
->result
;
334 struct checkout state
= CHECKOUT_INIT
;
339 state
.refresh_cache
= 1;
340 state
.istate
= index
;
342 progress
= get_progress(o
);
345 git_attr_set_direction(GIT_ATTR_CHECKOUT
, index
);
346 for (i
= 0; i
< index
->cache_nr
; i
++) {
347 const struct cache_entry
*ce
= index
->cache
[i
];
349 if (ce
->ce_flags
& CE_WT_REMOVE
) {
350 display_progress(progress
, ++cnt
);
351 if (o
->update
&& !o
->dry_run
)
355 remove_marked_cache_entries(index
);
356 remove_scheduled_dirs();
358 if (should_update_submodules() && o
->update
&& !o
->dry_run
)
359 reload_gitmodules_file(index
, &state
);
361 for (i
= 0; i
< index
->cache_nr
; i
++) {
362 struct cache_entry
*ce
= index
->cache
[i
];
364 if (ce
->ce_flags
& CE_UPDATE
) {
365 if (ce
->ce_flags
& CE_WT_REMOVE
)
366 die("BUG: both update and delete flags are set on %s",
368 display_progress(progress
, ++cnt
);
369 ce
->ce_flags
&= ~CE_UPDATE
;
370 if (o
->update
&& !o
->dry_run
) {
371 errs
|= checkout_entry(ce
, &state
, NULL
);
375 stop_progress(&progress
);
377 git_attr_set_direction(GIT_ATTR_CHECKIN
, NULL
);
381 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
382 struct unpack_trees_options
*o
);
383 static int verify_absent_sparse(const struct cache_entry
*ce
,
384 enum unpack_trees_error_types
,
385 struct unpack_trees_options
*o
);
387 static int apply_sparse_checkout(struct index_state
*istate
,
388 struct cache_entry
*ce
,
389 struct unpack_trees_options
*o
)
391 int was_skip_worktree
= ce_skip_worktree(ce
);
393 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
394 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
396 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
397 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
398 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
399 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
403 * if (!was_skip_worktree && !ce_skip_worktree()) {
404 * This is perfectly normal. Move on;
409 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
410 * area as a result of ce_skip_worktree() shortcuts in
411 * verify_absent() and verify_uptodate().
412 * Make sure they don't modify worktree if they are already
413 * outside checkout area
415 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
416 ce
->ce_flags
&= ~CE_UPDATE
;
419 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
420 * on to get that file removed from both index and worktree.
421 * If that file is already outside worktree area, don't
424 if (ce
->ce_flags
& CE_REMOVE
)
425 ce
->ce_flags
&= ~CE_WT_REMOVE
;
428 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
430 * If CE_UPDATE is set, verify_uptodate() must be called already
431 * also stat info may have lost after merged_entry() so calling
432 * verify_uptodate() again may fail
434 if (!(ce
->ce_flags
& CE_UPDATE
) && verify_uptodate_sparse(ce
, o
))
436 ce
->ce_flags
|= CE_WT_REMOVE
;
437 ce
->ce_flags
&= ~CE_UPDATE
;
439 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
440 if (verify_absent_sparse(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
))
442 ce
->ce_flags
|= CE_UPDATE
;
447 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
448 struct unpack_trees_options
*o
)
450 int ret
= o
->fn(src
, o
);
456 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
458 ce
->ce_flags
|= CE_UNPACKED
;
460 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
461 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
462 int bottom
= o
->cache_bottom
;
463 while (bottom
< o
->src_index
->cache_nr
&&
464 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
466 o
->cache_bottom
= bottom
;
470 static void mark_all_ce_unused(struct index_state
*index
)
473 for (i
= 0; i
< index
->cache_nr
; i
++)
474 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
477 static int locate_in_src_index(const struct cache_entry
*ce
,
478 struct unpack_trees_options
*o
)
480 struct index_state
*index
= o
->src_index
;
481 int len
= ce_namelen(ce
);
482 int pos
= index_name_pos(index
, ce
->name
, len
);
489 * We call unpack_index_entry() with an unmerged cache entry
490 * only in diff-index, and it wants a single callback. Skip
491 * the other unmerged entry with the same name.
493 static void mark_ce_used_same_name(struct cache_entry
*ce
,
494 struct unpack_trees_options
*o
)
496 struct index_state
*index
= o
->src_index
;
497 int len
= ce_namelen(ce
);
500 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
501 struct cache_entry
*next
= index
->cache
[pos
];
502 if (len
!= ce_namelen(next
) ||
503 memcmp(ce
->name
, next
->name
, len
))
505 mark_ce_used(next
, o
);
509 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
511 const struct index_state
*index
= o
->src_index
;
512 int pos
= o
->cache_bottom
;
514 while (pos
< index
->cache_nr
) {
515 struct cache_entry
*ce
= index
->cache
[pos
];
516 if (!(ce
->ce_flags
& CE_UNPACKED
))
523 static void add_same_unmerged(const struct cache_entry
*ce
,
524 struct unpack_trees_options
*o
)
526 struct index_state
*index
= o
->src_index
;
527 int len
= ce_namelen(ce
);
528 int pos
= index_name_pos(index
, ce
->name
, len
);
531 die("programming error in a caller of mark_ce_used_same_name");
532 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
533 struct cache_entry
*next
= index
->cache
[pos
];
534 if (len
!= ce_namelen(next
) ||
535 memcmp(ce
->name
, next
->name
, len
))
537 add_entry(o
, next
, 0, 0);
538 mark_ce_used(next
, o
);
542 static int unpack_index_entry(struct cache_entry
*ce
,
543 struct unpack_trees_options
*o
)
545 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
552 if (o
->skip_unmerged
) {
553 add_entry(o
, ce
, 0, 0);
557 ret
= call_unpack_fn(src
, o
);
559 mark_ce_used_same_name(ce
, o
);
563 static int find_cache_pos(struct traverse_info
*, const struct name_entry
*);
565 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
567 struct unpack_trees_options
*o
= info
->data
;
569 if (o
->diff_index_cached
)
571 o
->cache_bottom
= bottom
;
574 static int switch_cache_bottom(struct traverse_info
*info
)
576 struct unpack_trees_options
*o
= info
->data
;
579 if (o
->diff_index_cached
)
581 ret
= o
->cache_bottom
;
582 pos
= find_cache_pos(info
->prev
, &info
->name
);
585 o
->cache_bottom
= -2 - pos
;
587 o
->cache_bottom
= o
->src_index
->cache_nr
;
591 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
593 return name_j
->oid
&& name_k
->oid
&& !oidcmp(name_j
->oid
, name_k
->oid
);
596 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
597 unsigned long df_conflicts
,
598 struct name_entry
*names
,
599 struct traverse_info
*info
)
603 struct tree_desc t
[MAX_UNPACK_TREES
];
604 void *buf
[MAX_UNPACK_TREES
];
605 struct traverse_info newinfo
;
606 struct name_entry
*p
;
614 newinfo
.pathspec
= info
->pathspec
;
616 newinfo
.pathlen
+= tree_entry_len(p
) + 1;
617 newinfo
.df_conflicts
|= df_conflicts
;
620 * Fetch the tree from the ODB for each peer directory in the
623 * For 2- and 3-way traversals, we try to avoid hitting the
624 * ODB twice for the same OID. This should yield a nice speed
625 * up in checkouts and merges when the commits are similar.
627 * We don't bother doing the full O(n^2) search for larger n,
628 * because wider traversals don't happen that often and we
629 * avoid the search setup.
631 * When 2 peer OIDs are the same, we just copy the tree
632 * descriptor data. This implicitly borrows the buffer
633 * data from the earlier cell.
635 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
636 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
638 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
641 const unsigned char *sha1
= NULL
;
643 sha1
= names
[i
].oid
->hash
;
644 buf
[nr_buf
++] = fill_tree_descriptor(t
+i
, sha1
);
648 bottom
= switch_cache_bottom(&newinfo
);
649 ret
= traverse_trees(n
, t
, &newinfo
);
650 restore_cache_bottom(&newinfo
, bottom
);
652 for (i
= 0; i
< nr_buf
; i
++)
659 * Compare the traverse-path to the cache entry without actually
660 * having to generate the textual representation of the traverse
663 * NOTE! This *only* compares up to the size of the traverse path
664 * itself - the caller needs to do the final check for the cache
665 * entry having more data at the end!
667 static int do_compare_entry_piecewise(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
669 int len
, pathlen
, ce_len
;
673 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
678 pathlen
= info
->pathlen
;
679 ce_len
= ce_namelen(ce
);
681 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
682 if (ce_len
< pathlen
)
686 ce_name
= ce
->name
+ pathlen
;
688 len
= tree_entry_len(n
);
689 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
692 static int do_compare_entry(const struct cache_entry
*ce
,
693 const struct traverse_info
*info
,
694 const struct name_entry
*n
)
696 int len
, pathlen
, ce_len
;
701 * If we have not precomputed the traverse path, it is quicker
702 * to avoid doing so. But if we have precomputed it,
703 * it is quicker to use the precomputed version.
705 if (!info
->traverse_path
)
706 return do_compare_entry_piecewise(ce
, info
, n
);
708 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
712 pathlen
= info
->pathlen
;
713 ce_len
= ce_namelen(ce
);
715 if (ce_len
< pathlen
)
719 ce_name
= ce
->name
+ pathlen
;
721 len
= tree_entry_len(n
);
722 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
725 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
727 int cmp
= do_compare_entry(ce
, info
, n
);
732 * Even if the beginning compared identically, the ce should
733 * compare as bigger than a directory leading up to it!
735 return ce_namelen(ce
) > traverse_path_len(info
, n
);
738 static int ce_in_traverse_path(const struct cache_entry
*ce
,
739 const struct traverse_info
*info
)
743 if (do_compare_entry(ce
, info
->prev
, &info
->name
))
746 * If ce (blob) is the same name as the path (which is a tree
747 * we will be descending into), it won't be inside it.
749 return (info
->pathlen
< ce_namelen(ce
));
752 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
, const struct name_entry
*n
, int stage
)
754 int len
= traverse_path_len(info
, n
);
755 struct cache_entry
*ce
= xcalloc(1, cache_entry_size(len
));
757 ce
->ce_mode
= create_ce_mode(n
->mode
);
758 ce
->ce_flags
= create_ce_flags(stage
);
759 ce
->ce_namelen
= len
;
760 oidcpy(&ce
->oid
, n
->oid
);
761 make_traverse_path(ce
->name
, info
, n
);
766 static int unpack_nondirectories(int n
, unsigned long mask
,
767 unsigned long dirmask
,
768 struct cache_entry
**src
,
769 const struct name_entry
*names
,
770 const struct traverse_info
*info
)
773 struct unpack_trees_options
*o
= info
->data
;
774 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
776 /* Do we have *only* directories? Nothing to do */
777 if (mask
== dirmask
&& !src
[0])
781 * Ok, we've filled in up to any potential index entry in src[0],
784 for (i
= 0; i
< n
; i
++) {
786 unsigned int bit
= 1ul << i
;
787 if (conflicts
& bit
) {
788 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
795 else if (i
+ 1 < o
->head_idx
)
797 else if (i
+ 1 > o
->head_idx
)
801 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
);
805 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
807 for (i
= 0; i
< n
; i
++) {
808 struct cache_entry
*ce
= src
[i
+ o
->merge
];
809 if (ce
!= o
->df_conflict_entry
)
815 for (i
= 0; i
< n
; i
++)
816 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
817 if (do_add_entry(o
, src
[i
], 0, 0))
823 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
825 discard_index(&o
->result
);
826 if (!o
->gently
&& !o
->exiting_early
) {
828 return error("%s", message
);
835 * The tree traversal is looking at name p. If we have a matching entry,
836 * return it. If name p is a directory in the index, do not return
837 * anything, as we will want to match it when the traversal descends into
840 static int find_cache_pos(struct traverse_info
*info
,
841 const struct name_entry
*p
)
844 struct unpack_trees_options
*o
= info
->data
;
845 struct index_state
*index
= o
->src_index
;
846 int pfxlen
= info
->pathlen
;
847 int p_len
= tree_entry_len(p
);
849 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
850 const struct cache_entry
*ce
= index
->cache
[pos
];
851 const char *ce_name
, *ce_slash
;
854 if (ce
->ce_flags
& CE_UNPACKED
) {
856 * cache_bottom entry is already unpacked, so
857 * we can never match it; don't check it
860 if (pos
== o
->cache_bottom
)
864 if (!ce_in_traverse_path(ce
, info
)) {
866 * Check if we can skip future cache checks
867 * (because we're already past all possible
868 * entries in the traverse path).
870 if (info
->traverse_path
) {
871 if (strncmp(ce
->name
, info
->traverse_path
,
877 ce_name
= ce
->name
+ pfxlen
;
878 ce_slash
= strchr(ce_name
, '/');
880 ce_len
= ce_slash
- ce_name
;
882 ce_len
= ce_namelen(ce
) - pfxlen
;
883 cmp
= name_compare(p
->path
, p_len
, ce_name
, ce_len
);
885 * Exact match; if we have a directory we need to
886 * delay returning it.
889 return ce_slash
? -2 - pos
: pos
;
891 continue; /* keep looking */
893 * ce_name sorts after p->path; could it be that we
894 * have files under p->path directory in the index?
895 * E.g. ce_name == "t-i", and p->path == "t"; we may
896 * have "t/a" in the index.
898 if (p_len
< ce_len
&& !memcmp(ce_name
, p
->path
, p_len
) &&
899 ce_name
[p_len
] < '/')
900 continue; /* keep looking */
906 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
907 const struct name_entry
*p
)
909 int pos
= find_cache_pos(info
, p
);
910 struct unpack_trees_options
*o
= info
->data
;
913 return o
->src_index
->cache
[pos
];
918 static void debug_path(struct traverse_info
*info
)
921 debug_path(info
->prev
);
922 if (*info
->prev
->name
.path
)
925 printf("%s", info
->name
.path
);
928 static void debug_name_entry(int i
, struct name_entry
*n
)
930 printf("ent#%d %06o %s\n", i
,
931 n
->path
? n
->mode
: 0,
932 n
->path
? n
->path
: "(missing)");
935 static void debug_unpack_callback(int n
,
937 unsigned long dirmask
,
938 struct name_entry
*names
,
939 struct traverse_info
*info
)
942 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
946 for (i
= 0; i
< n
; i
++)
947 debug_name_entry(i
, names
+ i
);
950 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
952 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
953 struct unpack_trees_options
*o
= info
->data
;
954 const struct name_entry
*p
= names
;
956 /* Find first entry with a real name (we could use "mask" too) */
961 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
963 /* Are we supposed to look at the index too? */
967 struct cache_entry
*ce
;
969 if (o
->diff_index_cached
)
970 ce
= next_cache_entry(o
);
972 ce
= find_cache_entry(info
, p
);
976 cmp
= compare_entry(ce
, info
, p
);
978 if (unpack_index_entry(ce
, o
) < 0)
979 return unpack_failed(o
, NULL
);
985 * If we skip unmerged index
986 * entries, we'll skip this
987 * entry *and* the tree
988 * entries associated with it!
990 if (o
->skip_unmerged
) {
991 add_same_unmerged(ce
, o
);
1001 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
1004 if (o
->merge
&& src
[0]) {
1005 if (ce_stage(src
[0]))
1006 mark_ce_used_same_name(src
[0], o
);
1008 mark_ce_used(src
[0], o
);
1011 /* Now handle any directories.. */
1013 /* special case: "diff-index --cached" looking at a tree */
1014 if (o
->diff_index_cached
&&
1015 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1017 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1020 * Everything under the name matches; skip the
1021 * entire hierarchy. diff_index_cached codepath
1022 * special cases D/F conflicts in such a way that
1023 * it does not do any look-ahead, so this is safe.
1026 o
->cache_bottom
+= matches
;
1031 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1040 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1041 struct strbuf
*prefix
,
1042 int select_mask
, int clear_mask
,
1043 struct exclude_list
*el
, int defval
);
1045 /* Whole directory matching */
1046 static int clear_ce_flags_dir(struct cache_entry
**cache
, int nr
,
1047 struct strbuf
*prefix
,
1049 int select_mask
, int clear_mask
,
1050 struct exclude_list
*el
, int defval
)
1052 struct cache_entry
**cache_end
;
1054 int ret
= is_excluded_from_list(prefix
->buf
, prefix
->len
,
1055 basename
, &dtype
, el
, &the_index
);
1058 strbuf_addch(prefix
, '/');
1060 /* If undecided, use matching result of parent dir in defval */
1064 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1065 struct cache_entry
*ce
= *cache_end
;
1066 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1071 * TODO: check el, if there are no patterns that may conflict
1072 * with ret (iow, we know in advance the incl/excl
1073 * decision for the entire directory), clear flag here without
1074 * calling clear_ce_flags_1(). That function will call
1075 * the expensive is_excluded_from_list() on every entry.
1077 rc
= clear_ce_flags_1(cache
, cache_end
- cache
,
1079 select_mask
, clear_mask
,
1081 strbuf_setlen(prefix
, prefix
->len
- 1);
1086 * Traverse the index, find every entry that matches according to
1087 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
1088 * number of traversed entries.
1090 * If select_mask is non-zero, only entries whose ce_flags has on of
1091 * those bits enabled are traversed.
1093 * cache : pointer to an index entry
1094 * prefix_len : an offset to its path
1096 * The current path ("prefix") including the trailing '/' is
1097 * cache[0]->name[0..(prefix_len-1)]
1098 * Top level path has prefix_len zero.
1100 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1101 struct strbuf
*prefix
,
1102 int select_mask
, int clear_mask
,
1103 struct exclude_list
*el
, int defval
)
1105 struct cache_entry
**cache_end
= cache
+ nr
;
1108 * Process all entries that have the given prefix and meet
1109 * select_mask condition
1111 while(cache
!= cache_end
) {
1112 struct cache_entry
*ce
= *cache
;
1113 const char *name
, *slash
;
1114 int len
, dtype
, ret
;
1116 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1121 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1124 name
= ce
->name
+ prefix
->len
;
1125 slash
= strchr(name
, '/');
1127 /* If it's a directory, try whole directory match first */
1132 strbuf_add(prefix
, name
, len
);
1134 processed
= clear_ce_flags_dir(cache
, cache_end
- cache
,
1136 prefix
->buf
+ prefix
->len
- len
,
1137 select_mask
, clear_mask
,
1140 /* clear_c_f_dir eats a whole dir already? */
1143 strbuf_setlen(prefix
, prefix
->len
- len
);
1147 strbuf_addch(prefix
, '/');
1148 cache
+= clear_ce_flags_1(cache
, cache_end
- cache
,
1150 select_mask
, clear_mask
, el
, defval
);
1151 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1156 dtype
= ce_to_dtype(ce
);
1157 ret
= is_excluded_from_list(ce
->name
, ce_namelen(ce
),
1158 name
, &dtype
, el
, &the_index
);
1162 ce
->ce_flags
&= ~clear_mask
;
1165 return nr
- (cache_end
- cache
);
1168 static int clear_ce_flags(struct cache_entry
**cache
, int nr
,
1169 int select_mask
, int clear_mask
,
1170 struct exclude_list
*el
)
1172 static struct strbuf prefix
= STRBUF_INIT
;
1174 strbuf_reset(&prefix
);
1176 return clear_ce_flags_1(cache
, nr
,
1178 select_mask
, clear_mask
,
1183 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1185 static void mark_new_skip_worktree(struct exclude_list
*el
,
1186 struct index_state
*the_index
,
1187 int select_flag
, int skip_wt_flag
)
1192 * 1. Pretend the narrowest worktree: only unmerged entries
1195 for (i
= 0; i
< the_index
->cache_nr
; i
++) {
1196 struct cache_entry
*ce
= the_index
->cache
[i
];
1198 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1202 ce
->ce_flags
|= skip_wt_flag
;
1204 ce
->ce_flags
&= ~skip_wt_flag
;
1208 * 2. Widen worktree according to sparse-checkout file.
1209 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1211 clear_ce_flags(the_index
->cache
, the_index
->cache_nr
,
1212 select_flag
, skip_wt_flag
, el
);
1215 static int verify_absent(const struct cache_entry
*,
1216 enum unpack_trees_error_types
,
1217 struct unpack_trees_options
*);
1219 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1220 * resulting index, -2 on failure to reflect the changes to the work tree.
1222 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1224 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1227 static struct cache_entry
*dfc
;
1228 struct exclude_list el
;
1230 if (len
> MAX_UNPACK_TREES
)
1231 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1233 memset(&el
, 0, sizeof(el
));
1234 if (!core_apply_sparse_checkout
|| !o
->update
)
1235 o
->skip_sparse_checkout
= 1;
1236 if (!o
->skip_sparse_checkout
) {
1237 char *sparse
= git_pathdup("info/sparse-checkout");
1238 if (add_excludes_from_file_to_list(sparse
, "", 0, &el
, NULL
) < 0)
1239 o
->skip_sparse_checkout
= 1;
1245 memset(&o
->result
, 0, sizeof(o
->result
));
1246 o
->result
.initialized
= 1;
1247 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1248 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1249 o
->result
.version
= o
->src_index
->version
;
1250 o
->result
.split_index
= o
->src_index
->split_index
;
1251 if (o
->result
.split_index
)
1252 o
->result
.split_index
->refcount
++;
1253 hashcpy(o
->result
.sha1
, o
->src_index
->sha1
);
1254 o
->merge_size
= len
;
1255 mark_all_ce_unused(o
->src_index
);
1258 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1260 if (!o
->skip_sparse_checkout
)
1261 mark_new_skip_worktree(o
->el
, o
->src_index
, 0, CE_NEW_SKIP_WORKTREE
);
1264 dfc
= xcalloc(1, cache_entry_size(0));
1265 o
->df_conflict_entry
= dfc
;
1268 const char *prefix
= o
->prefix
? o
->prefix
: "";
1269 struct traverse_info info
;
1271 setup_traverse_info(&info
, prefix
);
1272 info
.fn
= unpack_callback
;
1274 info
.show_all_errors
= o
->show_all_errors
;
1275 info
.pathspec
= o
->pathspec
;
1279 * Unpack existing index entries that sort before the
1280 * prefix the tree is spliced into. Note that o->merge
1281 * is always true in this case.
1284 struct cache_entry
*ce
= next_cache_entry(o
);
1287 if (ce_in_traverse_path(ce
, &info
))
1289 if (unpack_index_entry(ce
, o
) < 0)
1294 if (traverse_trees(len
, t
, &info
) < 0)
1298 /* Any left-over entries in the index? */
1301 struct cache_entry
*ce
= next_cache_entry(o
);
1304 if (unpack_index_entry(ce
, o
) < 0)
1308 mark_all_ce_unused(o
->src_index
);
1310 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1311 ret
= unpack_failed(o
, "Merge requires file-level merging");
1315 if (!o
->skip_sparse_checkout
) {
1316 int empty_worktree
= 1;
1319 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1320 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1321 * so apply_sparse_checkout() won't attempt to remove it from worktree
1323 mark_new_skip_worktree(o
->el
, &o
->result
, CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1326 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1327 struct cache_entry
*ce
= o
->result
.cache
[i
];
1330 * Entries marked with CE_ADDED in merged_entry() do not have
1331 * verify_absent() check (the check is effectively disabled
1332 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1334 * Do the real check now because we have had
1335 * correct CE_NEW_SKIP_WORKTREE
1337 if (ce
->ce_flags
& CE_ADDED
&&
1338 verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1339 if (!o
->show_all_errors
)
1344 if (apply_sparse_checkout(&o
->result
, ce
, o
)) {
1345 if (!o
->show_all_errors
)
1349 if (!ce_skip_worktree(ce
))
1356 * Sparse checkout is meant to narrow down checkout area
1357 * but it does not make sense to narrow down to empty working
1358 * tree. This is usually a mistake in sparse checkout rules.
1359 * Do not allow users to do that.
1361 if (o
->result
.cache_nr
&& empty_worktree
) {
1362 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1367 o
->src_index
= NULL
;
1368 ret
= check_updates(o
) ? (-2) : 0;
1371 if (!o
->result
.cache_tree
)
1372 o
->result
.cache_tree
= cache_tree();
1373 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1374 cache_tree_update(&o
->result
,
1378 move_index_extensions(&o
->result
, o
->dst_index
);
1379 discard_index(o
->dst_index
);
1380 *o
->dst_index
= o
->result
;
1382 discard_index(&o
->result
);
1386 clear_exclude_list(&el
);
1390 if (o
->show_all_errors
)
1391 display_error_msgs(o
);
1392 mark_all_ce_unused(o
->src_index
);
1393 ret
= unpack_failed(o
, NULL
);
1394 if (o
->exiting_early
)
1399 /* Here come the merge functions */
1401 static int reject_merge(const struct cache_entry
*ce
,
1402 struct unpack_trees_options
*o
)
1404 return o
->gently
? -1 :
1405 add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1408 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1414 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1416 return a
->ce_mode
== b
->ce_mode
&&
1417 !oidcmp(&a
->oid
, &b
->oid
);
1422 * When a CE gets turned into an unmerged entry, we
1423 * want it to be up-to-date
1425 static int verify_uptodate_1(const struct cache_entry
*ce
,
1426 struct unpack_trees_options
*o
,
1427 enum unpack_trees_error_types error_type
)
1435 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1436 * if this entry is truly up-to-date because this file may be
1439 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1440 ; /* keep checking */
1441 else if (o
->reset
|| ce_uptodate(ce
))
1444 if (!lstat(ce
->name
, &st
)) {
1445 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1446 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1448 if (submodule_from_ce(ce
)) {
1449 int r
= check_submodule_move_head(ce
,
1450 "HEAD", oid_to_hex(&ce
->oid
), o
);
1452 return o
->gently
? -1 :
1453 add_rejected_path(o
, error_type
, ce
->name
);
1460 * Historic default policy was to allow submodule to be out
1461 * of sync wrt the superproject index. If the submodule was
1462 * not considered interesting above, we don't care here.
1464 if (S_ISGITLINK(ce
->ce_mode
))
1469 if (errno
== ENOENT
)
1471 return o
->gently
? -1 :
1472 add_rejected_path(o
, error_type
, ce
->name
);
1475 static int verify_uptodate(const struct cache_entry
*ce
,
1476 struct unpack_trees_options
*o
)
1478 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1480 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1483 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1484 struct unpack_trees_options
*o
)
1486 return verify_uptodate_1(ce
, o
, ERROR_SPARSE_NOT_UPTODATE_FILE
);
1489 static void invalidate_ce_path(const struct cache_entry
*ce
,
1490 struct unpack_trees_options
*o
)
1494 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1495 untracked_cache_invalidate_path(o
->src_index
, ce
->name
);
1499 * Check that checking out ce->sha1 in subdir ce->name is not
1500 * going to overwrite any working files.
1502 * Currently, git does not checkout subprojects during a superproject
1503 * checkout, so it is not going to overwrite anything.
1505 static int verify_clean_submodule(const char *old_sha1
,
1506 const struct cache_entry
*ce
,
1507 enum unpack_trees_error_types error_type
,
1508 struct unpack_trees_options
*o
)
1510 if (!submodule_from_ce(ce
))
1513 return check_submodule_move_head(ce
, old_sha1
,
1514 oid_to_hex(&ce
->oid
), o
);
1517 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1518 enum unpack_trees_error_types error_type
,
1519 struct unpack_trees_options
*o
)
1522 * we are about to extract "ce->name"; we would not want to lose
1523 * anything in the existing directory there.
1527 struct dir_struct d
;
1531 if (S_ISGITLINK(ce
->ce_mode
)) {
1532 unsigned char sha1
[20];
1533 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", sha1
);
1535 * If we are not going to update the submodule, then
1538 if (!sub_head
&& !hashcmp(sha1
, ce
->oid
.hash
))
1540 return verify_clean_submodule(sub_head
? NULL
: sha1_to_hex(sha1
),
1545 * First let's make sure we do not have a local modification
1546 * in that directory.
1548 namelen
= ce_namelen(ce
);
1549 for (i
= locate_in_src_index(ce
, o
);
1550 i
< o
->src_index
->cache_nr
;
1552 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1553 int len
= ce_namelen(ce2
);
1554 if (len
< namelen
||
1555 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1556 ce2
->name
[namelen
] != '/')
1559 * ce2->name is an entry in the subdirectory to be
1562 if (!ce_stage(ce2
)) {
1563 if (verify_uptodate(ce2
, o
))
1565 add_entry(o
, ce2
, CE_REMOVE
, 0);
1566 mark_ce_used(ce2
, o
);
1572 * Then we need to make sure that we do not lose a locally
1573 * present file that is not ignored.
1575 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
1577 memset(&d
, 0, sizeof(d
));
1579 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
1580 i
= read_directory(&d
, &the_index
, pathbuf
, namelen
+1, NULL
);
1582 return o
->gently
? -1 :
1583 add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
1589 * This gets called when there was no index entry for the tree entry 'dst',
1590 * but we found a file in the working tree that 'lstat()' said was fine,
1591 * and we're on a case-insensitive filesystem.
1593 * See if we can find a case-insensitive match in the index that also
1594 * matches the stat information, and assume it's that other file!
1596 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
1598 const struct cache_entry
*src
;
1600 src
= index_file_exists(o
->src_index
, name
, len
, 1);
1601 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
1604 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
1605 const struct cache_entry
*ce
, struct stat
*st
,
1606 enum unpack_trees_error_types error_type
,
1607 struct unpack_trees_options
*o
)
1609 const struct cache_entry
*result
;
1612 * It may be that the 'lstat()' succeeded even though
1613 * target 'ce' was absent, because there is an old
1614 * entry that is different only in case..
1616 * Ignore that lstat() if it matches.
1618 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
1622 is_excluded(o
->dir
, &the_index
, name
, &dtype
))
1624 * ce->name is explicitly excluded, so it is Ok to
1628 if (S_ISDIR(st
->st_mode
)) {
1630 * We are checking out path "foo" and
1631 * found "foo/." in the working tree.
1632 * This is tricky -- if we have modified
1633 * files that are in "foo/" we would lose
1636 if (verify_clean_subdirectory(ce
, error_type
, o
) < 0)
1642 * The previous round may already have decided to
1643 * delete this path, which is in a subdirectory that
1644 * is being replaced with a blob.
1646 result
= index_file_exists(&o
->result
, name
, len
, 0);
1648 if (result
->ce_flags
& CE_REMOVE
)
1652 return o
->gently
? -1 :
1653 add_rejected_path(o
, error_type
, name
);
1657 * We do not want to remove or overwrite a working tree file that
1658 * is not tracked, unless it is ignored.
1660 static int verify_absent_1(const struct cache_entry
*ce
,
1661 enum unpack_trees_error_types error_type
,
1662 struct unpack_trees_options
*o
)
1667 if (o
->index_only
|| o
->reset
|| !o
->update
)
1670 len
= check_leading_path(ce
->name
, ce_namelen(ce
));
1677 path
= xmemdupz(ce
->name
, len
);
1678 if (lstat(path
, &st
))
1679 ret
= error_errno("cannot stat '%s'", path
);
1681 if (submodule_from_ce(ce
))
1682 ret
= check_submodule_move_head(ce
,
1683 oid_to_hex(&ce
->oid
),
1686 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
1687 &st
, error_type
, o
);
1691 } else if (lstat(ce
->name
, &st
)) {
1692 if (errno
!= ENOENT
)
1693 return error_errno("cannot stat '%s'", ce
->name
);
1696 if (submodule_from_ce(ce
))
1697 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
1700 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
1701 ce_to_dtype(ce
), ce
, &st
,
1706 static int verify_absent(const struct cache_entry
*ce
,
1707 enum unpack_trees_error_types error_type
,
1708 struct unpack_trees_options
*o
)
1710 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1712 return verify_absent_1(ce
, error_type
, o
);
1715 static int verify_absent_sparse(const struct cache_entry
*ce
,
1716 enum unpack_trees_error_types error_type
,
1717 struct unpack_trees_options
*o
)
1719 enum unpack_trees_error_types orphaned_error
= error_type
;
1720 if (orphaned_error
== ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
)
1721 orphaned_error
= ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
;
1723 return verify_absent_1(ce
, orphaned_error
, o
);
1726 static int merged_entry(const struct cache_entry
*ce
,
1727 const struct cache_entry
*old
,
1728 struct unpack_trees_options
*o
)
1730 int update
= CE_UPDATE
;
1731 struct cache_entry
*merge
= dup_entry(ce
);
1735 * New index entries. In sparse checkout, the following
1736 * verify_absent() will be delayed until after
1737 * traverse_trees() finishes in unpack_trees(), then:
1739 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1740 * - verify_absent() be called again, this time with
1741 * correct CE_NEW_SKIP_WORKTREE
1743 * verify_absent() call here does nothing in sparse
1744 * checkout (i.e. o->skip_sparse_checkout == 0)
1747 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
1749 if (verify_absent(merge
,
1750 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1754 invalidate_ce_path(merge
, o
);
1756 if (submodule_from_ce(ce
)) {
1757 int ret
= check_submodule_move_head(ce
, NULL
,
1758 oid_to_hex(&ce
->oid
),
1764 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
1766 * See if we can re-use the old CE directly?
1767 * That way we get the uptodate stat info.
1769 * This also removes the UPDATE flag on a match; otherwise
1770 * we will end up overwriting local changes in the work tree.
1772 if (same(old
, merge
)) {
1773 copy_cache_entry(merge
, old
);
1776 if (verify_uptodate(old
, o
)) {
1780 /* Migrate old flags over */
1781 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1782 invalidate_ce_path(old
, o
);
1785 if (submodule_from_ce(ce
)) {
1786 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
1787 oid_to_hex(&ce
->oid
),
1794 * Previously unmerged entry left as an existence
1795 * marker by read_index_unmerged();
1797 invalidate_ce_path(old
, o
);
1800 do_add_entry(o
, merge
, update
, CE_STAGEMASK
);
1804 static int deleted_entry(const struct cache_entry
*ce
,
1805 const struct cache_entry
*old
,
1806 struct unpack_trees_options
*o
)
1808 /* Did it exist in the index? */
1810 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1814 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
1816 add_entry(o
, ce
, CE_REMOVE
, 0);
1817 invalidate_ce_path(ce
, o
);
1821 static int keep_entry(const struct cache_entry
*ce
,
1822 struct unpack_trees_options
*o
)
1824 add_entry(o
, ce
, 0, 0);
1829 static void show_stage_entry(FILE *o
,
1830 const char *label
, const struct cache_entry
*ce
)
1833 fprintf(o
, "%s (missing)\n", label
);
1835 fprintf(o
, "%s%06o %s %d\t%s\n",
1838 oid_to_hex(&ce
->oid
),
1844 int threeway_merge(const struct cache_entry
* const *stages
,
1845 struct unpack_trees_options
*o
)
1847 const struct cache_entry
*index
;
1848 const struct cache_entry
*head
;
1849 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
1852 int remote_match
= 0;
1854 int df_conflict_head
= 0;
1855 int df_conflict_remote
= 0;
1857 int any_anc_missing
= 0;
1858 int no_anc_exists
= 1;
1861 for (i
= 1; i
< o
->head_idx
; i
++) {
1862 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
1863 any_anc_missing
= 1;
1869 head
= stages
[o
->head_idx
];
1871 if (head
== o
->df_conflict_entry
) {
1872 df_conflict_head
= 1;
1876 if (remote
== o
->df_conflict_entry
) {
1877 df_conflict_remote
= 1;
1882 * First, if there's a #16 situation, note that to prevent #13
1885 if (!same(remote
, head
)) {
1886 for (i
= 1; i
< o
->head_idx
; i
++) {
1887 if (same(stages
[i
], head
)) {
1890 if (same(stages
[i
], remote
)) {
1897 * We start with cases where the index is allowed to match
1898 * something other than the head: #14(ALT) and #2ALT, where it
1899 * is permitted to match the result instead.
1901 /* #14, #14ALT, #2ALT */
1902 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
1903 if (index
&& !same(index
, remote
) && !same(index
, head
))
1904 return reject_merge(index
, o
);
1905 return merged_entry(remote
, index
, o
);
1908 * If we have an entry in the index cache, then we want to
1909 * make sure that it matches head.
1911 if (index
&& !same(index
, head
))
1912 return reject_merge(index
, o
);
1916 if (same(head
, remote
))
1917 return merged_entry(head
, index
, o
);
1919 if (!df_conflict_remote
&& remote_match
&& !head_match
)
1920 return merged_entry(head
, index
, o
);
1924 if (!head
&& !remote
&& any_anc_missing
)
1928 * Under the "aggressive" rule, we resolve mostly trivial
1929 * cases that we historically had git-merge-one-file resolve.
1931 if (o
->aggressive
) {
1932 int head_deleted
= !head
;
1933 int remote_deleted
= !remote
;
1934 const struct cache_entry
*ce
= NULL
;
1943 for (i
= 1; i
< o
->head_idx
; i
++) {
1944 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1953 * Deleted in one and unchanged in the other.
1955 if ((head_deleted
&& remote_deleted
) ||
1956 (head_deleted
&& remote
&& remote_match
) ||
1957 (remote_deleted
&& head
&& head_match
)) {
1959 return deleted_entry(index
, index
, o
);
1960 if (ce
&& !head_deleted
) {
1961 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1967 * Added in both, identically.
1969 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
1970 return merged_entry(head
, index
, o
);
1974 /* Below are "no merge" cases, which require that the index be
1975 * up-to-date to avoid the files getting overwritten with
1976 * conflict resolution files.
1979 if (verify_uptodate(index
, o
))
1983 o
->nontrivial_merge
= 1;
1985 /* #2, #3, #4, #6, #7, #9, #10, #11. */
1987 if (!head_match
|| !remote_match
) {
1988 for (i
= 1; i
< o
->head_idx
; i
++) {
1989 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1990 keep_entry(stages
[i
], o
);
1998 fprintf(stderr
, "read-tree: warning #16 detected\n");
1999 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2000 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2003 if (head
) { count
+= keep_entry(head
, o
); }
2004 if (remote
) { count
+= keep_entry(remote
, o
); }
2011 * The rule is to "carry forward" what is in the index without losing
2012 * information across a "fast-forward", favoring a successful merge
2013 * over a merge failure when it makes sense. For details of the
2014 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2017 int twoway_merge(const struct cache_entry
* const *src
,
2018 struct unpack_trees_options
*o
)
2020 const struct cache_entry
*current
= src
[0];
2021 const struct cache_entry
*oldtree
= src
[1];
2022 const struct cache_entry
*newtree
= src
[2];
2024 if (o
->merge_size
!= 2)
2025 return error("Cannot do a twoway merge of %d trees",
2028 if (oldtree
== o
->df_conflict_entry
)
2030 if (newtree
== o
->df_conflict_entry
)
2034 if (current
->ce_flags
& CE_CONFLICTED
) {
2035 if (same(oldtree
, newtree
) || o
->reset
) {
2037 return deleted_entry(current
, current
, o
);
2039 return merged_entry(newtree
, current
, o
);
2041 return reject_merge(current
, o
);
2042 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2043 (!oldtree
&& newtree
&&
2044 same(current
, newtree
)) || /* 6 and 7 */
2045 (oldtree
&& newtree
&&
2046 same(oldtree
, newtree
)) || /* 14 and 15 */
2047 (oldtree
&& newtree
&&
2048 !same(oldtree
, newtree
) && /* 18 and 19 */
2049 same(current
, newtree
))) {
2050 return keep_entry(current
, o
);
2051 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2053 return deleted_entry(oldtree
, current
, o
);
2054 } else if (oldtree
&& newtree
&&
2055 same(current
, oldtree
) && !same(current
, newtree
)) {
2057 return merged_entry(newtree
, current
, o
);
2059 return reject_merge(current
, o
);
2062 if (oldtree
&& !o
->initial_checkout
) {
2064 * deletion of the path was staged;
2066 if (same(oldtree
, newtree
))
2068 return reject_merge(oldtree
, o
);
2070 return merged_entry(newtree
, current
, o
);
2072 return deleted_entry(oldtree
, current
, o
);
2078 * Keep the index entries at stage0, collapse stage1 but make sure
2079 * stage0 does not have anything there.
2081 int bind_merge(const struct cache_entry
* const *src
,
2082 struct unpack_trees_options
*o
)
2084 const struct cache_entry
*old
= src
[0];
2085 const struct cache_entry
*a
= src
[1];
2087 if (o
->merge_size
!= 1)
2088 return error("Cannot do a bind merge of %d trees",
2091 return o
->gently
? -1 :
2092 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2093 super_prefixed(a
->name
),
2094 super_prefixed(old
->name
));
2096 return keep_entry(old
, o
);
2098 return merged_entry(a
, NULL
, o
);
2105 * - take the stat information from stage0, take the data from stage1
2107 int oneway_merge(const struct cache_entry
* const *src
,
2108 struct unpack_trees_options
*o
)
2110 const struct cache_entry
*old
= src
[0];
2111 const struct cache_entry
*a
= src
[1];
2113 if (o
->merge_size
!= 1)
2114 return error("Cannot do a oneway merge of %d trees",
2117 if (!a
|| a
== o
->df_conflict_entry
)
2118 return deleted_entry(old
, old
, o
);
2120 if (old
&& same(old
, a
)) {
2122 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
)) {
2124 if (lstat(old
->name
, &st
) ||
2125 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2126 update
|= CE_UPDATE
;
2128 add_entry(o
, old
, update
, 0);
2131 return merged_entry(a
, old
, o
);