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 const struct submodule
*sub
= submodule_from_ce(ce
);
260 switch (sub
->update_strategy
.type
) {
261 case SM_UPDATE_UNSPECIFIED
:
262 case SM_UPDATE_CHECKOUT
:
263 if (submodule_move_head(ce
->name
, old_id
, new_id
, SUBMODULE_MOVE_HEAD_DRY_RUN
))
264 return o
->gently
? -1 :
265 add_rejected_path(o
, ERROR_WOULD_LOSE_SUBMODULE
, ce
->name
);
269 case SM_UPDATE_REBASE
:
270 case SM_UPDATE_MERGE
:
271 case SM_UPDATE_COMMAND
:
273 warning(_("submodule update strategy not supported for submodule '%s'"), ce
->name
);
278 static void reload_gitmodules_file(struct index_state
*index
,
279 struct checkout
*state
)
282 for (i
= 0; i
< index
->cache_nr
; i
++) {
283 struct cache_entry
*ce
= index
->cache
[i
];
284 if (ce
->ce_flags
& CE_UPDATE
) {
285 int r
= strcmp(ce
->name
, ".gitmodules");
290 checkout_entry(ce
, state
, NULL
);
292 git_config(submodule_config
, NULL
);
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 switch (sub
->update_strategy
.type
) {
308 case SM_UPDATE_UNSPECIFIED
:
309 case SM_UPDATE_CHECKOUT
:
310 case SM_UPDATE_REBASE
:
311 case SM_UPDATE_MERGE
:
312 submodule_move_head(ce
->name
, "HEAD", NULL
,
313 SUBMODULE_MOVE_HEAD_FORCE
);
316 case SM_UPDATE_COMMAND
:
317 return; /* Do not touch the submodule. */
320 if (!check_leading_path(ce
->name
, ce_namelen(ce
)))
322 if (remove_or_warn(ce
->ce_mode
, ce
->name
))
324 schedule_dir_for_removal(ce
->name
, ce_namelen(ce
));
327 static struct progress
*get_progress(struct unpack_trees_options
*o
)
329 unsigned cnt
= 0, total
= 0;
330 struct index_state
*index
= &o
->result
;
332 if (!o
->update
|| !o
->verbose_update
)
335 for (; cnt
< index
->cache_nr
; cnt
++) {
336 const struct cache_entry
*ce
= index
->cache
[cnt
];
337 if (ce
->ce_flags
& (CE_UPDATE
| CE_WT_REMOVE
))
341 return start_progress_delay(_("Checking out files"),
345 static int check_updates(struct unpack_trees_options
*o
)
349 struct progress
*progress
= NULL
;
350 struct index_state
*index
= &o
->result
;
351 struct checkout state
= CHECKOUT_INIT
;
356 state
.refresh_cache
= 1;
357 state
.istate
= index
;
359 progress
= get_progress(o
);
362 git_attr_set_direction(GIT_ATTR_CHECKOUT
, index
);
363 for (i
= 0; i
< index
->cache_nr
; i
++) {
364 const struct cache_entry
*ce
= index
->cache
[i
];
366 if (ce
->ce_flags
& CE_WT_REMOVE
) {
367 display_progress(progress
, ++cnt
);
368 if (o
->update
&& !o
->dry_run
)
372 remove_marked_cache_entries(index
);
373 remove_scheduled_dirs();
375 if (should_update_submodules() && o
->update
&& !o
->dry_run
)
376 reload_gitmodules_file(index
, &state
);
378 for (i
= 0; i
< index
->cache_nr
; i
++) {
379 struct cache_entry
*ce
= index
->cache
[i
];
381 if (ce
->ce_flags
& CE_UPDATE
) {
382 if (ce
->ce_flags
& CE_WT_REMOVE
)
383 die("BUG: both update and delete flags are set on %s",
385 display_progress(progress
, ++cnt
);
386 ce
->ce_flags
&= ~CE_UPDATE
;
387 if (o
->update
&& !o
->dry_run
) {
388 errs
|= checkout_entry(ce
, &state
, NULL
);
392 stop_progress(&progress
);
394 git_attr_set_direction(GIT_ATTR_CHECKIN
, NULL
);
398 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
399 struct unpack_trees_options
*o
);
400 static int verify_absent_sparse(const struct cache_entry
*ce
,
401 enum unpack_trees_error_types
,
402 struct unpack_trees_options
*o
);
404 static int apply_sparse_checkout(struct index_state
*istate
,
405 struct cache_entry
*ce
,
406 struct unpack_trees_options
*o
)
408 int was_skip_worktree
= ce_skip_worktree(ce
);
410 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
411 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
413 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
414 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
415 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
416 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
420 * if (!was_skip_worktree && !ce_skip_worktree()) {
421 * This is perfectly normal. Move on;
426 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
427 * area as a result of ce_skip_worktree() shortcuts in
428 * verify_absent() and verify_uptodate().
429 * Make sure they don't modify worktree if they are already
430 * outside checkout area
432 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
433 ce
->ce_flags
&= ~CE_UPDATE
;
436 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
437 * on to get that file removed from both index and worktree.
438 * If that file is already outside worktree area, don't
441 if (ce
->ce_flags
& CE_REMOVE
)
442 ce
->ce_flags
&= ~CE_WT_REMOVE
;
445 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
447 * If CE_UPDATE is set, verify_uptodate() must be called already
448 * also stat info may have lost after merged_entry() so calling
449 * verify_uptodate() again may fail
451 if (!(ce
->ce_flags
& CE_UPDATE
) && verify_uptodate_sparse(ce
, o
))
453 ce
->ce_flags
|= CE_WT_REMOVE
;
454 ce
->ce_flags
&= ~CE_UPDATE
;
456 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
457 if (verify_absent_sparse(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
))
459 ce
->ce_flags
|= CE_UPDATE
;
464 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
465 struct unpack_trees_options
*o
)
467 int ret
= o
->fn(src
, o
);
473 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
475 ce
->ce_flags
|= CE_UNPACKED
;
477 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
478 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
479 int bottom
= o
->cache_bottom
;
480 while (bottom
< o
->src_index
->cache_nr
&&
481 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
483 o
->cache_bottom
= bottom
;
487 static void mark_all_ce_unused(struct index_state
*index
)
490 for (i
= 0; i
< index
->cache_nr
; i
++)
491 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
494 static int locate_in_src_index(const struct cache_entry
*ce
,
495 struct unpack_trees_options
*o
)
497 struct index_state
*index
= o
->src_index
;
498 int len
= ce_namelen(ce
);
499 int pos
= index_name_pos(index
, ce
->name
, len
);
506 * We call unpack_index_entry() with an unmerged cache entry
507 * only in diff-index, and it wants a single callback. Skip
508 * the other unmerged entry with the same name.
510 static void mark_ce_used_same_name(struct cache_entry
*ce
,
511 struct unpack_trees_options
*o
)
513 struct index_state
*index
= o
->src_index
;
514 int len
= ce_namelen(ce
);
517 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
518 struct cache_entry
*next
= index
->cache
[pos
];
519 if (len
!= ce_namelen(next
) ||
520 memcmp(ce
->name
, next
->name
, len
))
522 mark_ce_used(next
, o
);
526 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
528 const struct index_state
*index
= o
->src_index
;
529 int pos
= o
->cache_bottom
;
531 while (pos
< index
->cache_nr
) {
532 struct cache_entry
*ce
= index
->cache
[pos
];
533 if (!(ce
->ce_flags
& CE_UNPACKED
))
540 static void add_same_unmerged(const struct cache_entry
*ce
,
541 struct unpack_trees_options
*o
)
543 struct index_state
*index
= o
->src_index
;
544 int len
= ce_namelen(ce
);
545 int pos
= index_name_pos(index
, ce
->name
, len
);
548 die("programming error in a caller of mark_ce_used_same_name");
549 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
550 struct cache_entry
*next
= index
->cache
[pos
];
551 if (len
!= ce_namelen(next
) ||
552 memcmp(ce
->name
, next
->name
, len
))
554 add_entry(o
, next
, 0, 0);
555 mark_ce_used(next
, o
);
559 static int unpack_index_entry(struct cache_entry
*ce
,
560 struct unpack_trees_options
*o
)
562 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
569 if (o
->skip_unmerged
) {
570 add_entry(o
, ce
, 0, 0);
574 ret
= call_unpack_fn(src
, o
);
576 mark_ce_used_same_name(ce
, o
);
580 static int find_cache_pos(struct traverse_info
*, const struct name_entry
*);
582 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
584 struct unpack_trees_options
*o
= info
->data
;
586 if (o
->diff_index_cached
)
588 o
->cache_bottom
= bottom
;
591 static int switch_cache_bottom(struct traverse_info
*info
)
593 struct unpack_trees_options
*o
= info
->data
;
596 if (o
->diff_index_cached
)
598 ret
= o
->cache_bottom
;
599 pos
= find_cache_pos(info
->prev
, &info
->name
);
602 o
->cache_bottom
= -2 - pos
;
604 o
->cache_bottom
= o
->src_index
->cache_nr
;
608 static inline int are_same_oid(struct name_entry
*name_j
, struct name_entry
*name_k
)
610 return name_j
->oid
&& name_k
->oid
&& !oidcmp(name_j
->oid
, name_k
->oid
);
613 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
614 unsigned long df_conflicts
,
615 struct name_entry
*names
,
616 struct traverse_info
*info
)
620 struct tree_desc t
[MAX_UNPACK_TREES
];
621 void *buf
[MAX_UNPACK_TREES
];
622 struct traverse_info newinfo
;
623 struct name_entry
*p
;
631 newinfo
.pathspec
= info
->pathspec
;
633 newinfo
.pathlen
+= tree_entry_len(p
) + 1;
634 newinfo
.df_conflicts
|= df_conflicts
;
637 * Fetch the tree from the ODB for each peer directory in the
640 * For 2- and 3-way traversals, we try to avoid hitting the
641 * ODB twice for the same OID. This should yield a nice speed
642 * up in checkouts and merges when the commits are similar.
644 * We don't bother doing the full O(n^2) search for larger n,
645 * because wider traversals don't happen that often and we
646 * avoid the search setup.
648 * When 2 peer OIDs are the same, we just copy the tree
649 * descriptor data. This implicitly borrows the buffer
650 * data from the earlier cell.
652 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
653 if (i
> 0 && are_same_oid(&names
[i
], &names
[i
- 1]))
655 else if (i
> 1 && are_same_oid(&names
[i
], &names
[i
- 2]))
658 const unsigned char *sha1
= NULL
;
660 sha1
= names
[i
].oid
->hash
;
661 buf
[nr_buf
++] = fill_tree_descriptor(t
+i
, sha1
);
665 bottom
= switch_cache_bottom(&newinfo
);
666 ret
= traverse_trees(n
, t
, &newinfo
);
667 restore_cache_bottom(&newinfo
, bottom
);
669 for (i
= 0; i
< nr_buf
; i
++)
676 * Compare the traverse-path to the cache entry without actually
677 * having to generate the textual representation of the traverse
680 * NOTE! This *only* compares up to the size of the traverse path
681 * itself - the caller needs to do the final check for the cache
682 * entry having more data at the end!
684 static int do_compare_entry_piecewise(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
686 int len
, pathlen
, ce_len
;
690 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
695 pathlen
= info
->pathlen
;
696 ce_len
= ce_namelen(ce
);
698 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
699 if (ce_len
< pathlen
)
703 ce_name
= ce
->name
+ pathlen
;
705 len
= tree_entry_len(n
);
706 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
709 static int do_compare_entry(const struct cache_entry
*ce
,
710 const struct traverse_info
*info
,
711 const struct name_entry
*n
)
713 int len
, pathlen
, ce_len
;
718 * If we have not precomputed the traverse path, it is quicker
719 * to avoid doing so. But if we have precomputed it,
720 * it is quicker to use the precomputed version.
722 if (!info
->traverse_path
)
723 return do_compare_entry_piecewise(ce
, info
, n
);
725 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
729 pathlen
= info
->pathlen
;
730 ce_len
= ce_namelen(ce
);
732 if (ce_len
< pathlen
)
736 ce_name
= ce
->name
+ pathlen
;
738 len
= tree_entry_len(n
);
739 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
742 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
744 int cmp
= do_compare_entry(ce
, info
, n
);
749 * Even if the beginning compared identically, the ce should
750 * compare as bigger than a directory leading up to it!
752 return ce_namelen(ce
) > traverse_path_len(info
, n
);
755 static int ce_in_traverse_path(const struct cache_entry
*ce
,
756 const struct traverse_info
*info
)
760 if (do_compare_entry(ce
, info
->prev
, &info
->name
))
763 * If ce (blob) is the same name as the path (which is a tree
764 * we will be descending into), it won't be inside it.
766 return (info
->pathlen
< ce_namelen(ce
));
769 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
, const struct name_entry
*n
, int stage
)
771 int len
= traverse_path_len(info
, n
);
772 struct cache_entry
*ce
= xcalloc(1, cache_entry_size(len
));
774 ce
->ce_mode
= create_ce_mode(n
->mode
);
775 ce
->ce_flags
= create_ce_flags(stage
);
776 ce
->ce_namelen
= len
;
777 oidcpy(&ce
->oid
, n
->oid
);
778 make_traverse_path(ce
->name
, info
, n
);
783 static int unpack_nondirectories(int n
, unsigned long mask
,
784 unsigned long dirmask
,
785 struct cache_entry
**src
,
786 const struct name_entry
*names
,
787 const struct traverse_info
*info
)
790 struct unpack_trees_options
*o
= info
->data
;
791 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
793 /* Do we have *only* directories? Nothing to do */
794 if (mask
== dirmask
&& !src
[0])
798 * Ok, we've filled in up to any potential index entry in src[0],
801 for (i
= 0; i
< n
; i
++) {
803 unsigned int bit
= 1ul << i
;
804 if (conflicts
& bit
) {
805 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
812 else if (i
+ 1 < o
->head_idx
)
814 else if (i
+ 1 > o
->head_idx
)
818 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
);
822 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
824 for (i
= 0; i
< n
; i
++) {
825 struct cache_entry
*ce
= src
[i
+ o
->merge
];
826 if (ce
!= o
->df_conflict_entry
)
832 for (i
= 0; i
< n
; i
++)
833 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
834 if (do_add_entry(o
, src
[i
], 0, 0))
840 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
842 discard_index(&o
->result
);
843 if (!o
->gently
&& !o
->exiting_early
) {
845 return error("%s", message
);
852 * The tree traversal is looking at name p. If we have a matching entry,
853 * return it. If name p is a directory in the index, do not return
854 * anything, as we will want to match it when the traversal descends into
857 static int find_cache_pos(struct traverse_info
*info
,
858 const struct name_entry
*p
)
861 struct unpack_trees_options
*o
= info
->data
;
862 struct index_state
*index
= o
->src_index
;
863 int pfxlen
= info
->pathlen
;
864 int p_len
= tree_entry_len(p
);
866 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
867 const struct cache_entry
*ce
= index
->cache
[pos
];
868 const char *ce_name
, *ce_slash
;
871 if (ce
->ce_flags
& CE_UNPACKED
) {
873 * cache_bottom entry is already unpacked, so
874 * we can never match it; don't check it
877 if (pos
== o
->cache_bottom
)
881 if (!ce_in_traverse_path(ce
, info
)) {
883 * Check if we can skip future cache checks
884 * (because we're already past all possible
885 * entries in the traverse path).
887 if (info
->traverse_path
) {
888 if (strncmp(ce
->name
, info
->traverse_path
,
894 ce_name
= ce
->name
+ pfxlen
;
895 ce_slash
= strchr(ce_name
, '/');
897 ce_len
= ce_slash
- ce_name
;
899 ce_len
= ce_namelen(ce
) - pfxlen
;
900 cmp
= name_compare(p
->path
, p_len
, ce_name
, ce_len
);
902 * Exact match; if we have a directory we need to
903 * delay returning it.
906 return ce_slash
? -2 - pos
: pos
;
908 continue; /* keep looking */
910 * ce_name sorts after p->path; could it be that we
911 * have files under p->path directory in the index?
912 * E.g. ce_name == "t-i", and p->path == "t"; we may
913 * have "t/a" in the index.
915 if (p_len
< ce_len
&& !memcmp(ce_name
, p
->path
, p_len
) &&
916 ce_name
[p_len
] < '/')
917 continue; /* keep looking */
923 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
924 const struct name_entry
*p
)
926 int pos
= find_cache_pos(info
, p
);
927 struct unpack_trees_options
*o
= info
->data
;
930 return o
->src_index
->cache
[pos
];
935 static void debug_path(struct traverse_info
*info
)
938 debug_path(info
->prev
);
939 if (*info
->prev
->name
.path
)
942 printf("%s", info
->name
.path
);
945 static void debug_name_entry(int i
, struct name_entry
*n
)
947 printf("ent#%d %06o %s\n", i
,
948 n
->path
? n
->mode
: 0,
949 n
->path
? n
->path
: "(missing)");
952 static void debug_unpack_callback(int n
,
954 unsigned long dirmask
,
955 struct name_entry
*names
,
956 struct traverse_info
*info
)
959 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
963 for (i
= 0; i
< n
; i
++)
964 debug_name_entry(i
, names
+ i
);
967 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
969 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
970 struct unpack_trees_options
*o
= info
->data
;
971 const struct name_entry
*p
= names
;
973 /* Find first entry with a real name (we could use "mask" too) */
978 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
980 /* Are we supposed to look at the index too? */
984 struct cache_entry
*ce
;
986 if (o
->diff_index_cached
)
987 ce
= next_cache_entry(o
);
989 ce
= find_cache_entry(info
, p
);
993 cmp
= compare_entry(ce
, info
, p
);
995 if (unpack_index_entry(ce
, o
) < 0)
996 return unpack_failed(o
, NULL
);
1002 * If we skip unmerged index
1003 * entries, we'll skip this
1004 * entry *and* the tree
1005 * entries associated with it!
1007 if (o
->skip_unmerged
) {
1008 add_same_unmerged(ce
, o
);
1018 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
1021 if (o
->merge
&& src
[0]) {
1022 if (ce_stage(src
[0]))
1023 mark_ce_used_same_name(src
[0], o
);
1025 mark_ce_used(src
[0], o
);
1028 /* Now handle any directories.. */
1030 /* special case: "diff-index --cached" looking at a tree */
1031 if (o
->diff_index_cached
&&
1032 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1034 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1037 * Everything under the name matches; skip the
1038 * entire hierarchy. diff_index_cached codepath
1039 * special cases D/F conflicts in such a way that
1040 * it does not do any look-ahead, so this is safe.
1043 o
->cache_bottom
+= matches
;
1048 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1057 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1058 struct strbuf
*prefix
,
1059 int select_mask
, int clear_mask
,
1060 struct exclude_list
*el
, int defval
);
1062 /* Whole directory matching */
1063 static int clear_ce_flags_dir(struct cache_entry
**cache
, int nr
,
1064 struct strbuf
*prefix
,
1066 int select_mask
, int clear_mask
,
1067 struct exclude_list
*el
, int defval
)
1069 struct cache_entry
**cache_end
;
1071 int ret
= is_excluded_from_list(prefix
->buf
, prefix
->len
,
1072 basename
, &dtype
, el
);
1075 strbuf_addch(prefix
, '/');
1077 /* If undecided, use matching result of parent dir in defval */
1081 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1082 struct cache_entry
*ce
= *cache_end
;
1083 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1088 * TODO: check el, if there are no patterns that may conflict
1089 * with ret (iow, we know in advance the incl/excl
1090 * decision for the entire directory), clear flag here without
1091 * calling clear_ce_flags_1(). That function will call
1092 * the expensive is_excluded_from_list() on every entry.
1094 rc
= clear_ce_flags_1(cache
, cache_end
- cache
,
1096 select_mask
, clear_mask
,
1098 strbuf_setlen(prefix
, prefix
->len
- 1);
1103 * Traverse the index, find every entry that matches according to
1104 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
1105 * number of traversed entries.
1107 * If select_mask is non-zero, only entries whose ce_flags has on of
1108 * those bits enabled are traversed.
1110 * cache : pointer to an index entry
1111 * prefix_len : an offset to its path
1113 * The current path ("prefix") including the trailing '/' is
1114 * cache[0]->name[0..(prefix_len-1)]
1115 * Top level path has prefix_len zero.
1117 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1118 struct strbuf
*prefix
,
1119 int select_mask
, int clear_mask
,
1120 struct exclude_list
*el
, int defval
)
1122 struct cache_entry
**cache_end
= cache
+ nr
;
1125 * Process all entries that have the given prefix and meet
1126 * select_mask condition
1128 while(cache
!= cache_end
) {
1129 struct cache_entry
*ce
= *cache
;
1130 const char *name
, *slash
;
1131 int len
, dtype
, ret
;
1133 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1138 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1141 name
= ce
->name
+ prefix
->len
;
1142 slash
= strchr(name
, '/');
1144 /* If it's a directory, try whole directory match first */
1149 strbuf_add(prefix
, name
, len
);
1151 processed
= clear_ce_flags_dir(cache
, cache_end
- cache
,
1153 prefix
->buf
+ prefix
->len
- len
,
1154 select_mask
, clear_mask
,
1157 /* clear_c_f_dir eats a whole dir already? */
1160 strbuf_setlen(prefix
, prefix
->len
- len
);
1164 strbuf_addch(prefix
, '/');
1165 cache
+= clear_ce_flags_1(cache
, cache_end
- cache
,
1167 select_mask
, clear_mask
, el
, defval
);
1168 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1173 dtype
= ce_to_dtype(ce
);
1174 ret
= is_excluded_from_list(ce
->name
, ce_namelen(ce
),
1179 ce
->ce_flags
&= ~clear_mask
;
1182 return nr
- (cache_end
- cache
);
1185 static int clear_ce_flags(struct cache_entry
**cache
, int nr
,
1186 int select_mask
, int clear_mask
,
1187 struct exclude_list
*el
)
1189 static struct strbuf prefix
= STRBUF_INIT
;
1191 strbuf_reset(&prefix
);
1193 return clear_ce_flags_1(cache
, nr
,
1195 select_mask
, clear_mask
,
1200 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1202 static void mark_new_skip_worktree(struct exclude_list
*el
,
1203 struct index_state
*the_index
,
1204 int select_flag
, int skip_wt_flag
)
1209 * 1. Pretend the narrowest worktree: only unmerged entries
1212 for (i
= 0; i
< the_index
->cache_nr
; i
++) {
1213 struct cache_entry
*ce
= the_index
->cache
[i
];
1215 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1219 ce
->ce_flags
|= skip_wt_flag
;
1221 ce
->ce_flags
&= ~skip_wt_flag
;
1225 * 2. Widen worktree according to sparse-checkout file.
1226 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1228 clear_ce_flags(the_index
->cache
, the_index
->cache_nr
,
1229 select_flag
, skip_wt_flag
, el
);
1232 static int verify_absent(const struct cache_entry
*,
1233 enum unpack_trees_error_types
,
1234 struct unpack_trees_options
*);
1236 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1237 * resulting index, -2 on failure to reflect the changes to the work tree.
1239 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1241 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1244 static struct cache_entry
*dfc
;
1245 struct exclude_list el
;
1247 if (len
> MAX_UNPACK_TREES
)
1248 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1250 memset(&el
, 0, sizeof(el
));
1251 if (!core_apply_sparse_checkout
|| !o
->update
)
1252 o
->skip_sparse_checkout
= 1;
1253 if (!o
->skip_sparse_checkout
) {
1254 char *sparse
= git_pathdup("info/sparse-checkout");
1255 if (add_excludes_from_file_to_list(sparse
, "", 0, &el
, 0) < 0)
1256 o
->skip_sparse_checkout
= 1;
1262 memset(&o
->result
, 0, sizeof(o
->result
));
1263 o
->result
.initialized
= 1;
1264 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1265 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1266 o
->result
.version
= o
->src_index
->version
;
1267 o
->result
.split_index
= o
->src_index
->split_index
;
1268 if (o
->result
.split_index
)
1269 o
->result
.split_index
->refcount
++;
1270 hashcpy(o
->result
.sha1
, o
->src_index
->sha1
);
1271 o
->merge_size
= len
;
1272 mark_all_ce_unused(o
->src_index
);
1275 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1277 if (!o
->skip_sparse_checkout
)
1278 mark_new_skip_worktree(o
->el
, o
->src_index
, 0, CE_NEW_SKIP_WORKTREE
);
1281 dfc
= xcalloc(1, cache_entry_size(0));
1282 o
->df_conflict_entry
= dfc
;
1285 const char *prefix
= o
->prefix
? o
->prefix
: "";
1286 struct traverse_info info
;
1288 setup_traverse_info(&info
, prefix
);
1289 info
.fn
= unpack_callback
;
1291 info
.show_all_errors
= o
->show_all_errors
;
1292 info
.pathspec
= o
->pathspec
;
1296 * Unpack existing index entries that sort before the
1297 * prefix the tree is spliced into. Note that o->merge
1298 * is always true in this case.
1301 struct cache_entry
*ce
= next_cache_entry(o
);
1304 if (ce_in_traverse_path(ce
, &info
))
1306 if (unpack_index_entry(ce
, o
) < 0)
1311 if (traverse_trees(len
, t
, &info
) < 0)
1315 /* Any left-over entries in the index? */
1318 struct cache_entry
*ce
= next_cache_entry(o
);
1321 if (unpack_index_entry(ce
, o
) < 0)
1325 mark_all_ce_unused(o
->src_index
);
1327 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1328 ret
= unpack_failed(o
, "Merge requires file-level merging");
1332 if (!o
->skip_sparse_checkout
) {
1333 int empty_worktree
= 1;
1336 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1337 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1338 * so apply_sparse_checkout() won't attempt to remove it from worktree
1340 mark_new_skip_worktree(o
->el
, &o
->result
, CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1343 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1344 struct cache_entry
*ce
= o
->result
.cache
[i
];
1347 * Entries marked with CE_ADDED in merged_entry() do not have
1348 * verify_absent() check (the check is effectively disabled
1349 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1351 * Do the real check now because we have had
1352 * correct CE_NEW_SKIP_WORKTREE
1354 if (ce
->ce_flags
& CE_ADDED
&&
1355 verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1356 if (!o
->show_all_errors
)
1361 if (apply_sparse_checkout(&o
->result
, ce
, o
)) {
1362 if (!o
->show_all_errors
)
1366 if (!ce_skip_worktree(ce
))
1373 * Sparse checkout is meant to narrow down checkout area
1374 * but it does not make sense to narrow down to empty working
1375 * tree. This is usually a mistake in sparse checkout rules.
1376 * Do not allow users to do that.
1378 if (o
->result
.cache_nr
&& empty_worktree
) {
1379 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1384 o
->src_index
= NULL
;
1385 ret
= check_updates(o
) ? (-2) : 0;
1388 if (!o
->result
.cache_tree
)
1389 o
->result
.cache_tree
= cache_tree();
1390 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1391 cache_tree_update(&o
->result
,
1395 discard_index(o
->dst_index
);
1396 *o
->dst_index
= o
->result
;
1398 discard_index(&o
->result
);
1402 clear_exclude_list(&el
);
1406 if (o
->show_all_errors
)
1407 display_error_msgs(o
);
1408 mark_all_ce_unused(o
->src_index
);
1409 ret
= unpack_failed(o
, NULL
);
1410 if (o
->exiting_early
)
1415 /* Here come the merge functions */
1417 static int reject_merge(const struct cache_entry
*ce
,
1418 struct unpack_trees_options
*o
)
1420 return o
->gently
? -1 :
1421 add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1424 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1430 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1432 return a
->ce_mode
== b
->ce_mode
&&
1433 !oidcmp(&a
->oid
, &b
->oid
);
1438 * When a CE gets turned into an unmerged entry, we
1439 * want it to be up-to-date
1441 static int verify_uptodate_1(const struct cache_entry
*ce
,
1442 struct unpack_trees_options
*o
,
1443 enum unpack_trees_error_types error_type
)
1451 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1452 * if this entry is truly up-to-date because this file may be
1455 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1456 ; /* keep checking */
1457 else if (o
->reset
|| ce_uptodate(ce
))
1460 if (!lstat(ce
->name
, &st
)) {
1461 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1462 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1464 if (submodule_from_ce(ce
)) {
1465 int r
= check_submodule_move_head(ce
,
1466 "HEAD", oid_to_hex(&ce
->oid
), o
);
1468 return o
->gently
? -1 :
1469 add_rejected_path(o
, error_type
, ce
->name
);
1476 * Historic default policy was to allow submodule to be out
1477 * of sync wrt the superproject index. If the submodule was
1478 * not considered interesting above, we don't care here.
1480 if (S_ISGITLINK(ce
->ce_mode
))
1485 if (errno
== ENOENT
)
1487 return o
->gently
? -1 :
1488 add_rejected_path(o
, error_type
, ce
->name
);
1491 static int verify_uptodate(const struct cache_entry
*ce
,
1492 struct unpack_trees_options
*o
)
1494 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1496 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1499 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1500 struct unpack_trees_options
*o
)
1502 return verify_uptodate_1(ce
, o
, ERROR_SPARSE_NOT_UPTODATE_FILE
);
1505 static void invalidate_ce_path(const struct cache_entry
*ce
,
1506 struct unpack_trees_options
*o
)
1510 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1511 untracked_cache_invalidate_path(o
->src_index
, ce
->name
);
1515 * Check that checking out ce->sha1 in subdir ce->name is not
1516 * going to overwrite any working files.
1518 * Currently, git does not checkout subprojects during a superproject
1519 * checkout, so it is not going to overwrite anything.
1521 static int verify_clean_submodule(const char *old_sha1
,
1522 const struct cache_entry
*ce
,
1523 enum unpack_trees_error_types error_type
,
1524 struct unpack_trees_options
*o
)
1526 if (!submodule_from_ce(ce
))
1529 return check_submodule_move_head(ce
, old_sha1
,
1530 oid_to_hex(&ce
->oid
), o
);
1533 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1534 enum unpack_trees_error_types error_type
,
1535 struct unpack_trees_options
*o
)
1538 * we are about to extract "ce->name"; we would not want to lose
1539 * anything in the existing directory there.
1543 struct dir_struct d
;
1547 if (S_ISGITLINK(ce
->ce_mode
)) {
1548 unsigned char sha1
[20];
1549 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", sha1
);
1551 * If we are not going to update the submodule, then
1554 if (!sub_head
&& !hashcmp(sha1
, ce
->oid
.hash
))
1556 return verify_clean_submodule(sub_head
? NULL
: sha1_to_hex(sha1
),
1561 * First let's make sure we do not have a local modification
1562 * in that directory.
1564 namelen
= ce_namelen(ce
);
1565 for (i
= locate_in_src_index(ce
, o
);
1566 i
< o
->src_index
->cache_nr
;
1568 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1569 int len
= ce_namelen(ce2
);
1570 if (len
< namelen
||
1571 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1572 ce2
->name
[namelen
] != '/')
1575 * ce2->name is an entry in the subdirectory to be
1578 if (!ce_stage(ce2
)) {
1579 if (verify_uptodate(ce2
, o
))
1581 add_entry(o
, ce2
, CE_REMOVE
, 0);
1582 mark_ce_used(ce2
, o
);
1588 * Then we need to make sure that we do not lose a locally
1589 * present file that is not ignored.
1591 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
1593 memset(&d
, 0, sizeof(d
));
1595 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
1596 i
= read_directory(&d
, pathbuf
, namelen
+1, NULL
);
1598 return o
->gently
? -1 :
1599 add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
1605 * This gets called when there was no index entry for the tree entry 'dst',
1606 * but we found a file in the working tree that 'lstat()' said was fine,
1607 * and we're on a case-insensitive filesystem.
1609 * See if we can find a case-insensitive match in the index that also
1610 * matches the stat information, and assume it's that other file!
1612 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
1614 const struct cache_entry
*src
;
1616 src
= index_file_exists(o
->src_index
, name
, len
, 1);
1617 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
1620 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
1621 const struct cache_entry
*ce
, struct stat
*st
,
1622 enum unpack_trees_error_types error_type
,
1623 struct unpack_trees_options
*o
)
1625 const struct cache_entry
*result
;
1628 * It may be that the 'lstat()' succeeded even though
1629 * target 'ce' was absent, because there is an old
1630 * entry that is different only in case..
1632 * Ignore that lstat() if it matches.
1634 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
1638 is_excluded(o
->dir
, name
, &dtype
))
1640 * ce->name is explicitly excluded, so it is Ok to
1644 if (S_ISDIR(st
->st_mode
)) {
1646 * We are checking out path "foo" and
1647 * found "foo/." in the working tree.
1648 * This is tricky -- if we have modified
1649 * files that are in "foo/" we would lose
1652 if (verify_clean_subdirectory(ce
, error_type
, o
) < 0)
1658 * The previous round may already have decided to
1659 * delete this path, which is in a subdirectory that
1660 * is being replaced with a blob.
1662 result
= index_file_exists(&o
->result
, name
, len
, 0);
1664 if (result
->ce_flags
& CE_REMOVE
)
1668 return o
->gently
? -1 :
1669 add_rejected_path(o
, error_type
, name
);
1673 * We do not want to remove or overwrite a working tree file that
1674 * is not tracked, unless it is ignored.
1676 static int verify_absent_1(const struct cache_entry
*ce
,
1677 enum unpack_trees_error_types error_type
,
1678 struct unpack_trees_options
*o
)
1683 if (o
->index_only
|| o
->reset
|| !o
->update
)
1686 len
= check_leading_path(ce
->name
, ce_namelen(ce
));
1693 path
= xmemdupz(ce
->name
, len
);
1694 if (lstat(path
, &st
))
1695 ret
= error_errno("cannot stat '%s'", path
);
1697 if (submodule_from_ce(ce
))
1698 ret
= check_submodule_move_head(ce
,
1699 oid_to_hex(&ce
->oid
),
1702 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
1703 &st
, error_type
, o
);
1707 } else if (lstat(ce
->name
, &st
)) {
1708 if (errno
!= ENOENT
)
1709 return error_errno("cannot stat '%s'", ce
->name
);
1712 if (submodule_from_ce(ce
))
1713 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
1716 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
1717 ce_to_dtype(ce
), ce
, &st
,
1722 static int verify_absent(const struct cache_entry
*ce
,
1723 enum unpack_trees_error_types error_type
,
1724 struct unpack_trees_options
*o
)
1726 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1728 return verify_absent_1(ce
, error_type
, o
);
1731 static int verify_absent_sparse(const struct cache_entry
*ce
,
1732 enum unpack_trees_error_types error_type
,
1733 struct unpack_trees_options
*o
)
1735 enum unpack_trees_error_types orphaned_error
= error_type
;
1736 if (orphaned_error
== ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
)
1737 orphaned_error
= ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
;
1739 return verify_absent_1(ce
, orphaned_error
, o
);
1742 static int merged_entry(const struct cache_entry
*ce
,
1743 const struct cache_entry
*old
,
1744 struct unpack_trees_options
*o
)
1746 int update
= CE_UPDATE
;
1747 struct cache_entry
*merge
= dup_entry(ce
);
1751 * New index entries. In sparse checkout, the following
1752 * verify_absent() will be delayed until after
1753 * traverse_trees() finishes in unpack_trees(), then:
1755 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1756 * - verify_absent() be called again, this time with
1757 * correct CE_NEW_SKIP_WORKTREE
1759 * verify_absent() call here does nothing in sparse
1760 * checkout (i.e. o->skip_sparse_checkout == 0)
1763 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
1765 if (verify_absent(merge
,
1766 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1770 invalidate_ce_path(merge
, o
);
1772 if (submodule_from_ce(ce
)) {
1773 int ret
= check_submodule_move_head(ce
, NULL
,
1774 oid_to_hex(&ce
->oid
),
1780 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
1782 * See if we can re-use the old CE directly?
1783 * That way we get the uptodate stat info.
1785 * This also removes the UPDATE flag on a match; otherwise
1786 * we will end up overwriting local changes in the work tree.
1788 if (same(old
, merge
)) {
1789 copy_cache_entry(merge
, old
);
1792 if (verify_uptodate(old
, o
)) {
1796 /* Migrate old flags over */
1797 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1798 invalidate_ce_path(old
, o
);
1801 if (submodule_from_ce(ce
)) {
1802 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
1803 oid_to_hex(&ce
->oid
),
1810 * Previously unmerged entry left as an existence
1811 * marker by read_index_unmerged();
1813 invalidate_ce_path(old
, o
);
1816 do_add_entry(o
, merge
, update
, CE_STAGEMASK
);
1820 static int deleted_entry(const struct cache_entry
*ce
,
1821 const struct cache_entry
*old
,
1822 struct unpack_trees_options
*o
)
1824 /* Did it exist in the index? */
1826 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1830 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
1832 add_entry(o
, ce
, CE_REMOVE
, 0);
1833 invalidate_ce_path(ce
, o
);
1837 static int keep_entry(const struct cache_entry
*ce
,
1838 struct unpack_trees_options
*o
)
1840 add_entry(o
, ce
, 0, 0);
1845 static void show_stage_entry(FILE *o
,
1846 const char *label
, const struct cache_entry
*ce
)
1849 fprintf(o
, "%s (missing)\n", label
);
1851 fprintf(o
, "%s%06o %s %d\t%s\n",
1854 oid_to_hex(&ce
->oid
),
1860 int threeway_merge(const struct cache_entry
* const *stages
,
1861 struct unpack_trees_options
*o
)
1863 const struct cache_entry
*index
;
1864 const struct cache_entry
*head
;
1865 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
1868 int remote_match
= 0;
1870 int df_conflict_head
= 0;
1871 int df_conflict_remote
= 0;
1873 int any_anc_missing
= 0;
1874 int no_anc_exists
= 1;
1877 for (i
= 1; i
< o
->head_idx
; i
++) {
1878 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
1879 any_anc_missing
= 1;
1885 head
= stages
[o
->head_idx
];
1887 if (head
== o
->df_conflict_entry
) {
1888 df_conflict_head
= 1;
1892 if (remote
== o
->df_conflict_entry
) {
1893 df_conflict_remote
= 1;
1898 * First, if there's a #16 situation, note that to prevent #13
1901 if (!same(remote
, head
)) {
1902 for (i
= 1; i
< o
->head_idx
; i
++) {
1903 if (same(stages
[i
], head
)) {
1906 if (same(stages
[i
], remote
)) {
1913 * We start with cases where the index is allowed to match
1914 * something other than the head: #14(ALT) and #2ALT, where it
1915 * is permitted to match the result instead.
1917 /* #14, #14ALT, #2ALT */
1918 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
1919 if (index
&& !same(index
, remote
) && !same(index
, head
))
1920 return reject_merge(index
, o
);
1921 return merged_entry(remote
, index
, o
);
1924 * If we have an entry in the index cache, then we want to
1925 * make sure that it matches head.
1927 if (index
&& !same(index
, head
))
1928 return reject_merge(index
, o
);
1932 if (same(head
, remote
))
1933 return merged_entry(head
, index
, o
);
1935 if (!df_conflict_remote
&& remote_match
&& !head_match
)
1936 return merged_entry(head
, index
, o
);
1940 if (!head
&& !remote
&& any_anc_missing
)
1944 * Under the "aggressive" rule, we resolve mostly trivial
1945 * cases that we historically had git-merge-one-file resolve.
1947 if (o
->aggressive
) {
1948 int head_deleted
= !head
;
1949 int remote_deleted
= !remote
;
1950 const struct cache_entry
*ce
= NULL
;
1959 for (i
= 1; i
< o
->head_idx
; i
++) {
1960 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1969 * Deleted in one and unchanged in the other.
1971 if ((head_deleted
&& remote_deleted
) ||
1972 (head_deleted
&& remote
&& remote_match
) ||
1973 (remote_deleted
&& head
&& head_match
)) {
1975 return deleted_entry(index
, index
, o
);
1976 if (ce
&& !head_deleted
) {
1977 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1983 * Added in both, identically.
1985 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
1986 return merged_entry(head
, index
, o
);
1990 /* Below are "no merge" cases, which require that the index be
1991 * up-to-date to avoid the files getting overwritten with
1992 * conflict resolution files.
1995 if (verify_uptodate(index
, o
))
1999 o
->nontrivial_merge
= 1;
2001 /* #2, #3, #4, #6, #7, #9, #10, #11. */
2003 if (!head_match
|| !remote_match
) {
2004 for (i
= 1; i
< o
->head_idx
; i
++) {
2005 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
2006 keep_entry(stages
[i
], o
);
2014 fprintf(stderr
, "read-tree: warning #16 detected\n");
2015 show_stage_entry(stderr
, "head ", stages
[head_match
]);
2016 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
2019 if (head
) { count
+= keep_entry(head
, o
); }
2020 if (remote
) { count
+= keep_entry(remote
, o
); }
2027 * The rule is to "carry forward" what is in the index without losing
2028 * information across a "fast-forward", favoring a successful merge
2029 * over a merge failure when it makes sense. For details of the
2030 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2033 int twoway_merge(const struct cache_entry
* const *src
,
2034 struct unpack_trees_options
*o
)
2036 const struct cache_entry
*current
= src
[0];
2037 const struct cache_entry
*oldtree
= src
[1];
2038 const struct cache_entry
*newtree
= src
[2];
2040 if (o
->merge_size
!= 2)
2041 return error("Cannot do a twoway merge of %d trees",
2044 if (oldtree
== o
->df_conflict_entry
)
2046 if (newtree
== o
->df_conflict_entry
)
2050 if (current
->ce_flags
& CE_CONFLICTED
) {
2051 if (same(oldtree
, newtree
) || o
->reset
) {
2053 return deleted_entry(current
, current
, o
);
2055 return merged_entry(newtree
, current
, o
);
2057 return reject_merge(current
, o
);
2058 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2059 (!oldtree
&& newtree
&&
2060 same(current
, newtree
)) || /* 6 and 7 */
2061 (oldtree
&& newtree
&&
2062 same(oldtree
, newtree
)) || /* 14 and 15 */
2063 (oldtree
&& newtree
&&
2064 !same(oldtree
, newtree
) && /* 18 and 19 */
2065 same(current
, newtree
))) {
2066 return keep_entry(current
, o
);
2067 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2069 return deleted_entry(oldtree
, current
, o
);
2070 } else if (oldtree
&& newtree
&&
2071 same(current
, oldtree
) && !same(current
, newtree
)) {
2073 return merged_entry(newtree
, current
, o
);
2075 return reject_merge(current
, o
);
2078 if (oldtree
&& !o
->initial_checkout
) {
2080 * deletion of the path was staged;
2082 if (same(oldtree
, newtree
))
2084 return reject_merge(oldtree
, o
);
2086 return merged_entry(newtree
, current
, o
);
2088 return deleted_entry(oldtree
, current
, o
);
2094 * Keep the index entries at stage0, collapse stage1 but make sure
2095 * stage0 does not have anything there.
2097 int bind_merge(const struct cache_entry
* const *src
,
2098 struct unpack_trees_options
*o
)
2100 const struct cache_entry
*old
= src
[0];
2101 const struct cache_entry
*a
= src
[1];
2103 if (o
->merge_size
!= 1)
2104 return error("Cannot do a bind merge of %d trees",
2107 return o
->gently
? -1 :
2108 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2109 super_prefixed(a
->name
),
2110 super_prefixed(old
->name
));
2112 return keep_entry(old
, o
);
2114 return merged_entry(a
, NULL
, o
);
2121 * - take the stat information from stage0, take the data from stage1
2123 int oneway_merge(const struct cache_entry
* const *src
,
2124 struct unpack_trees_options
*o
)
2126 const struct cache_entry
*old
= src
[0];
2127 const struct cache_entry
*a
= src
[1];
2129 if (o
->merge_size
!= 1)
2130 return error("Cannot do a oneway merge of %d trees",
2133 if (!a
|| a
== o
->df_conflict_entry
)
2134 return deleted_entry(old
, old
, o
);
2136 if (old
&& same(old
, a
)) {
2138 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
)) {
2140 if (lstat(old
->name
, &st
) ||
2141 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2142 update
|= CE_UPDATE
;
2144 add_entry(o
, old
, update
, 0);
2147 return merged_entry(a
, old
, o
);