1 #define NO_THE_INDEX_COMPATIBILITY_MACROS
6 #include "cache-tree.h"
7 #include "unpack-trees.h"
11 #include "split-index.h"
13 #include "submodule.h"
14 #include "submodule-config.h"
17 * Error messages expected by scripts out of plumbing commands such as
18 * read-tree. Non-scripted Porcelain is not required to use these messages
19 * and in fact are encouraged to reword them to better suit their particular
20 * situation better. See how "git checkout" and "git merge" replaces
21 * them using setup_unpack_trees_porcelain(), for example.
23 static const char *unpack_plumbing_errors
[NB_UNPACK_TREES_ERROR_TYPES
] = {
24 /* ERROR_WOULD_OVERWRITE */
25 "Entry '%s' would be overwritten by merge. Cannot merge.",
27 /* ERROR_NOT_UPTODATE_FILE */
28 "Entry '%s' not uptodate. Cannot merge.",
30 /* ERROR_NOT_UPTODATE_DIR */
31 "Updating '%s' would lose untracked files in it",
33 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
34 "Untracked working tree file '%s' would be overwritten by merge.",
36 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
37 "Untracked working tree file '%s' would be removed by merge.",
39 /* ERROR_BIND_OVERLAP */
40 "Entry '%s' overlaps with '%s'. Cannot bind.",
42 /* ERROR_SPARSE_NOT_UPTODATE_FILE */
43 "Entry '%s' not uptodate. Cannot update sparse checkout.",
45 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
46 "Working tree file '%s' would be overwritten by sparse checkout update.",
48 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
49 "Working tree file '%s' would be removed by sparse checkout update.",
51 /* ERROR_WOULD_LOSE_SUBMODULE */
52 "Submodule '%s' cannot checkout new HEAD.",
55 #define ERRORMSG(o,type) \
56 ( ((o) && (o)->msgs[(type)]) \
57 ? ((o)->msgs[(type)]) \
58 : (unpack_plumbing_errors[(type)]) )
60 static const char *super_prefixed(const char *path
)
63 * It is necessary and sufficient to have two static buffers
64 * here, as the return value of this function is fed to
65 * error() using the unpack_*_errors[] templates we see above.
67 static struct strbuf buf
[2] = {STRBUF_INIT
, STRBUF_INIT
};
68 static int super_prefix_len
= -1;
69 static unsigned idx
= ARRAY_SIZE(buf
) - 1;
71 if (super_prefix_len
< 0) {
72 const char *super_prefix
= get_super_prefix();
77 for (i
= 0; i
< ARRAY_SIZE(buf
); i
++)
78 strbuf_addstr(&buf
[i
], super_prefix
);
79 super_prefix_len
= buf
[0].len
;
83 if (!super_prefix_len
)
86 if (++idx
>= ARRAY_SIZE(buf
))
89 strbuf_setlen(&buf
[idx
], super_prefix_len
);
90 strbuf_addstr(&buf
[idx
], path
);
95 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
99 const char **msgs
= opts
->msgs
;
102 if (!strcmp(cmd
, "checkout"))
103 msg
= advice_commit_before_merge
104 ? _("Your local changes to the following files would be overwritten by checkout:\n%%s"
105 "Please commit your changes or stash them before you switch branches.")
106 : _("Your local changes to the following files would be overwritten by checkout:\n%%s");
107 else if (!strcmp(cmd
, "merge"))
108 msg
= advice_commit_before_merge
109 ? _("Your local changes to the following files would be overwritten by merge:\n%%s"
110 "Please commit your changes or stash them before you merge.")
111 : _("Your local changes to the following files would be overwritten by merge:\n%%s");
113 msg
= advice_commit_before_merge
114 ? _("Your local changes to the following files would be overwritten by %s:\n%%s"
115 "Please commit your changes or stash them before you %s.")
116 : _("Your local changes to the following files would be overwritten by %s:\n%%s");
117 msgs
[ERROR_WOULD_OVERWRITE
] = msgs
[ERROR_NOT_UPTODATE_FILE
] =
118 xstrfmt(msg
, cmd
, cmd
);
120 msgs
[ERROR_NOT_UPTODATE_DIR
] =
121 _("Updating the following directories would lose untracked files in them:\n%s");
123 if (!strcmp(cmd
, "checkout"))
124 msg
= advice_commit_before_merge
125 ? _("The following untracked working tree files would be removed by checkout:\n%%s"
126 "Please move or remove them before you switch branches.")
127 : _("The following untracked working tree files would be removed by checkout:\n%%s");
128 else if (!strcmp(cmd
, "merge"))
129 msg
= advice_commit_before_merge
130 ? _("The following untracked working tree files would be removed by merge:\n%%s"
131 "Please move or remove them before you merge.")
132 : _("The following untracked working tree files would be removed by merge:\n%%s");
134 msg
= advice_commit_before_merge
135 ? _("The following untracked working tree files would be removed by %s:\n%%s"
136 "Please move or remove them before you %s.")
137 : _("The following untracked working tree files would be removed by %s:\n%%s");
138 msgs
[ERROR_WOULD_LOSE_UNTRACKED_REMOVED
] = xstrfmt(msg
, cmd
, cmd
);
140 if (!strcmp(cmd
, "checkout"))
141 msg
= advice_commit_before_merge
142 ? _("The following untracked working tree files would be overwritten by checkout:\n%%s"
143 "Please move or remove them before you switch branches.")
144 : _("The following untracked working tree files would be overwritten by checkout:\n%%s");
145 else if (!strcmp(cmd
, "merge"))
146 msg
= advice_commit_before_merge
147 ? _("The following untracked working tree files would be overwritten by merge:\n%%s"
148 "Please move or remove them before you merge.")
149 : _("The following untracked working tree files would be overwritten by merge:\n%%s");
151 msg
= advice_commit_before_merge
152 ? _("The following untracked working tree files would be overwritten by %s:\n%%s"
153 "Please move or remove them before you %s.")
154 : _("The following untracked working tree files would be overwritten by %s:\n%%s");
155 msgs
[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
] = xstrfmt(msg
, cmd
, cmd
);
158 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
159 * cannot easily display it as a list.
161 msgs
[ERROR_BIND_OVERLAP
] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
163 msgs
[ERROR_SPARSE_NOT_UPTODATE_FILE
] =
164 _("Cannot update sparse checkout: the following entries are not up-to-date:\n%s");
165 msgs
[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
] =
166 _("The following working tree files would be overwritten by sparse checkout update:\n%s");
167 msgs
[ERROR_WOULD_LOSE_ORPHANED_REMOVED
] =
168 _("The following working tree files would be removed by sparse checkout update:\n%s");
169 msgs
[ERROR_WOULD_LOSE_SUBMODULE
] =
170 _("Cannot update submodule:\n%s");
172 opts
->show_all_errors
= 1;
173 /* rejected paths may not have a static buffer */
174 for (i
= 0; i
< ARRAY_SIZE(opts
->unpack_rejects
); i
++)
175 opts
->unpack_rejects
[i
].strdup_strings
= 1;
178 static int do_add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
179 unsigned int set
, unsigned int clear
)
186 ce
->ce_flags
= (ce
->ce_flags
& ~clear
) | set
;
187 return add_index_entry(&o
->result
, ce
,
188 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
191 static struct cache_entry
*dup_entry(const struct cache_entry
*ce
)
193 unsigned int size
= ce_size(ce
);
194 struct cache_entry
*new = xmalloc(size
);
196 memcpy(new, ce
, size
);
200 static void add_entry(struct unpack_trees_options
*o
,
201 const struct cache_entry
*ce
,
202 unsigned int set
, unsigned int clear
)
204 do_add_entry(o
, dup_entry(ce
), set
, clear
);
208 * add error messages on path <path>
209 * corresponding to the type <e> with the message <msg>
210 * indicating if it should be display in porcelain or not
212 static int add_rejected_path(struct unpack_trees_options
*o
,
213 enum unpack_trees_error_types e
,
216 if (!o
->show_all_errors
)
217 return error(ERRORMSG(o
, e
), super_prefixed(path
));
220 * Otherwise, insert in a list for future display by
221 * display_error_msgs()
223 string_list_append(&o
->unpack_rejects
[e
], path
);
228 * display all the error messages stored in a nice way
230 static void display_error_msgs(struct unpack_trees_options
*o
)
233 int something_displayed
= 0;
234 for (e
= 0; e
< NB_UNPACK_TREES_ERROR_TYPES
; e
++) {
235 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
236 if (rejects
->nr
> 0) {
237 struct strbuf path
= STRBUF_INIT
;
238 something_displayed
= 1;
239 for (i
= 0; i
< rejects
->nr
; i
++)
240 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
241 error(ERRORMSG(o
, e
), super_prefixed(path
.buf
));
242 strbuf_release(&path
);
244 string_list_clear(rejects
, 0);
246 if (something_displayed
)
247 fprintf(stderr
, _("Aborting\n"));
250 static int check_submodule_move_head(const struct cache_entry
*ce
,
253 struct unpack_trees_options
*o
)
255 unsigned flags
= SUBMODULE_MOVE_HEAD_DRY_RUN
;
256 const struct submodule
*sub
= submodule_from_ce(ce
);
261 flags
|= SUBMODULE_MOVE_HEAD_FORCE
;
263 switch (sub
->update_strategy
.type
) {
264 case SM_UPDATE_UNSPECIFIED
:
265 case SM_UPDATE_CHECKOUT
:
266 if (submodule_move_head(ce
->name
, old_id
, new_id
, flags
))
267 return o
->gently
? -1 :
268 add_rejected_path(o
, ERROR_WOULD_LOSE_SUBMODULE
, ce
->name
);
272 case SM_UPDATE_REBASE
:
273 case SM_UPDATE_MERGE
:
274 case SM_UPDATE_COMMAND
:
276 warning(_("submodule update strategy not supported for submodule '%s'"), ce
->name
);
281 static void reload_gitmodules_file(struct index_state
*index
,
282 struct checkout
*state
)
285 for (i
= 0; i
< index
->cache_nr
; i
++) {
286 struct cache_entry
*ce
= index
->cache
[i
];
287 if (ce
->ce_flags
& CE_UPDATE
) {
288 int r
= strcmp(ce
->name
, ".gitmodules");
293 checkout_entry(ce
, state
, NULL
);
295 git_config(submodule_config
, NULL
);
303 * Unlink the last component and schedule the leading directories for
304 * removal, such that empty directories get removed.
306 static void unlink_entry(const struct cache_entry
*ce
)
308 const struct submodule
*sub
= submodule_from_ce(ce
);
310 switch (sub
->update_strategy
.type
) {
311 case SM_UPDATE_UNSPECIFIED
:
312 case SM_UPDATE_CHECKOUT
:
313 case SM_UPDATE_REBASE
:
314 case SM_UPDATE_MERGE
:
315 /* state.force is set at the caller. */
316 submodule_move_head(ce
->name
, "HEAD", NULL
,
317 SUBMODULE_MOVE_HEAD_FORCE
);
320 case SM_UPDATE_COMMAND
:
321 return; /* Do not touch the submodule. */
324 if (!check_leading_path(ce
->name
, ce_namelen(ce
)))
326 if (remove_or_warn(ce
->ce_mode
, ce
->name
))
328 schedule_dir_for_removal(ce
->name
, ce_namelen(ce
));
331 static struct progress
*get_progress(struct unpack_trees_options
*o
)
333 unsigned cnt
= 0, total
= 0;
334 struct index_state
*index
= &o
->result
;
336 if (!o
->update
|| !o
->verbose_update
)
339 for (; cnt
< index
->cache_nr
; cnt
++) {
340 const struct cache_entry
*ce
= index
->cache
[cnt
];
341 if (ce
->ce_flags
& (CE_UPDATE
| CE_WT_REMOVE
))
345 return start_progress_delay(_("Checking out files"),
349 static int check_updates(struct unpack_trees_options
*o
)
353 struct progress
*progress
= NULL
;
354 struct index_state
*index
= &o
->result
;
355 struct checkout state
= CHECKOUT_INIT
;
360 state
.refresh_cache
= 1;
361 state
.istate
= index
;
363 progress
= get_progress(o
);
366 git_attr_set_direction(GIT_ATTR_CHECKOUT
, index
);
367 for (i
= 0; i
< index
->cache_nr
; i
++) {
368 const struct cache_entry
*ce
= index
->cache
[i
];
370 if (ce
->ce_flags
& CE_WT_REMOVE
) {
371 display_progress(progress
, ++cnt
);
372 if (o
->update
&& !o
->dry_run
)
376 remove_marked_cache_entries(index
);
377 remove_scheduled_dirs();
379 if (should_update_submodules() && o
->update
&& !o
->dry_run
)
380 reload_gitmodules_file(index
, &state
);
382 for (i
= 0; i
< index
->cache_nr
; i
++) {
383 struct cache_entry
*ce
= index
->cache
[i
];
385 if (ce
->ce_flags
& CE_UPDATE
) {
386 if (ce
->ce_flags
& CE_WT_REMOVE
)
387 die("BUG: both update and delete flags are set on %s",
389 display_progress(progress
, ++cnt
);
390 ce
->ce_flags
&= ~CE_UPDATE
;
391 if (o
->update
&& !o
->dry_run
) {
392 errs
|= checkout_entry(ce
, &state
, NULL
);
396 stop_progress(&progress
);
398 git_attr_set_direction(GIT_ATTR_CHECKIN
, NULL
);
402 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
403 struct unpack_trees_options
*o
);
404 static int verify_absent_sparse(const struct cache_entry
*ce
,
405 enum unpack_trees_error_types
,
406 struct unpack_trees_options
*o
);
408 static int apply_sparse_checkout(struct index_state
*istate
,
409 struct cache_entry
*ce
,
410 struct unpack_trees_options
*o
)
412 int was_skip_worktree
= ce_skip_worktree(ce
);
414 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
415 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
417 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
418 if (was_skip_worktree
!= ce_skip_worktree(ce
)) {
419 ce
->ce_flags
|= CE_UPDATE_IN_BASE
;
420 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
424 * if (!was_skip_worktree && !ce_skip_worktree()) {
425 * This is perfectly normal. Move on;
430 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
431 * area as a result of ce_skip_worktree() shortcuts in
432 * verify_absent() and verify_uptodate().
433 * Make sure they don't modify worktree if they are already
434 * outside checkout area
436 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
437 ce
->ce_flags
&= ~CE_UPDATE
;
440 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
441 * on to get that file removed from both index and worktree.
442 * If that file is already outside worktree area, don't
445 if (ce
->ce_flags
& CE_REMOVE
)
446 ce
->ce_flags
&= ~CE_WT_REMOVE
;
449 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
451 * If CE_UPDATE is set, verify_uptodate() must be called already
452 * also stat info may have lost after merged_entry() so calling
453 * verify_uptodate() again may fail
455 if (!(ce
->ce_flags
& CE_UPDATE
) && verify_uptodate_sparse(ce
, o
))
457 ce
->ce_flags
|= CE_WT_REMOVE
;
458 ce
->ce_flags
&= ~CE_UPDATE
;
460 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
461 if (verify_absent_sparse(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
))
463 ce
->ce_flags
|= CE_UPDATE
;
468 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
469 struct unpack_trees_options
*o
)
471 int ret
= o
->fn(src
, o
);
477 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
479 ce
->ce_flags
|= CE_UNPACKED
;
481 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
482 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
483 int bottom
= o
->cache_bottom
;
484 while (bottom
< o
->src_index
->cache_nr
&&
485 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
487 o
->cache_bottom
= bottom
;
491 static void mark_all_ce_unused(struct index_state
*index
)
494 for (i
= 0; i
< index
->cache_nr
; i
++)
495 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
498 static int locate_in_src_index(const struct cache_entry
*ce
,
499 struct unpack_trees_options
*o
)
501 struct index_state
*index
= o
->src_index
;
502 int len
= ce_namelen(ce
);
503 int pos
= index_name_pos(index
, ce
->name
, len
);
510 * We call unpack_index_entry() with an unmerged cache entry
511 * only in diff-index, and it wants a single callback. Skip
512 * the other unmerged entry with the same name.
514 static void mark_ce_used_same_name(struct cache_entry
*ce
,
515 struct unpack_trees_options
*o
)
517 struct index_state
*index
= o
->src_index
;
518 int len
= ce_namelen(ce
);
521 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
522 struct cache_entry
*next
= index
->cache
[pos
];
523 if (len
!= ce_namelen(next
) ||
524 memcmp(ce
->name
, next
->name
, len
))
526 mark_ce_used(next
, o
);
530 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
532 const struct index_state
*index
= o
->src_index
;
533 int pos
= o
->cache_bottom
;
535 while (pos
< index
->cache_nr
) {
536 struct cache_entry
*ce
= index
->cache
[pos
];
537 if (!(ce
->ce_flags
& CE_UNPACKED
))
544 static void add_same_unmerged(const struct cache_entry
*ce
,
545 struct unpack_trees_options
*o
)
547 struct index_state
*index
= o
->src_index
;
548 int len
= ce_namelen(ce
);
549 int pos
= index_name_pos(index
, ce
->name
, len
);
552 die("programming error in a caller of mark_ce_used_same_name");
553 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
554 struct cache_entry
*next
= index
->cache
[pos
];
555 if (len
!= ce_namelen(next
) ||
556 memcmp(ce
->name
, next
->name
, len
))
558 add_entry(o
, next
, 0, 0);
559 mark_ce_used(next
, o
);
563 static int unpack_index_entry(struct cache_entry
*ce
,
564 struct unpack_trees_options
*o
)
566 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
573 if (o
->skip_unmerged
) {
574 add_entry(o
, ce
, 0, 0);
578 ret
= call_unpack_fn(src
, o
);
580 mark_ce_used_same_name(ce
, o
);
584 static int find_cache_pos(struct traverse_info
*, const struct name_entry
*);
586 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
588 struct unpack_trees_options
*o
= info
->data
;
590 if (o
->diff_index_cached
)
592 o
->cache_bottom
= bottom
;
595 static int switch_cache_bottom(struct traverse_info
*info
)
597 struct unpack_trees_options
*o
= info
->data
;
600 if (o
->diff_index_cached
)
602 ret
= o
->cache_bottom
;
603 pos
= find_cache_pos(info
->prev
, &info
->name
);
606 o
->cache_bottom
= -2 - pos
;
608 o
->cache_bottom
= o
->src_index
->cache_nr
;
612 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
613 unsigned long df_conflicts
,
614 struct name_entry
*names
,
615 struct traverse_info
*info
)
618 struct tree_desc t
[MAX_UNPACK_TREES
];
619 void *buf
[MAX_UNPACK_TREES
];
620 struct traverse_info newinfo
;
621 struct name_entry
*p
;
629 newinfo
.pathspec
= info
->pathspec
;
631 newinfo
.pathlen
+= tree_entry_len(p
) + 1;
632 newinfo
.df_conflicts
|= df_conflicts
;
634 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
635 const unsigned char *sha1
= NULL
;
637 sha1
= names
[i
].oid
->hash
;
638 buf
[i
] = fill_tree_descriptor(t
+i
, sha1
);
641 bottom
= switch_cache_bottom(&newinfo
);
642 ret
= traverse_trees(n
, t
, &newinfo
);
643 restore_cache_bottom(&newinfo
, bottom
);
645 for (i
= 0; i
< n
; i
++)
652 * Compare the traverse-path to the cache entry without actually
653 * having to generate the textual representation of the traverse
656 * NOTE! This *only* compares up to the size of the traverse path
657 * itself - the caller needs to do the final check for the cache
658 * entry having more data at the end!
660 static int do_compare_entry_piecewise(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
662 int len
, pathlen
, ce_len
;
666 int cmp
= do_compare_entry_piecewise(ce
, info
->prev
,
671 pathlen
= info
->pathlen
;
672 ce_len
= ce_namelen(ce
);
674 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
675 if (ce_len
< pathlen
)
679 ce_name
= ce
->name
+ pathlen
;
681 len
= tree_entry_len(n
);
682 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
685 static int do_compare_entry(const struct cache_entry
*ce
,
686 const struct traverse_info
*info
,
687 const struct name_entry
*n
)
689 int len
, pathlen
, ce_len
;
694 * If we have not precomputed the traverse path, it is quicker
695 * to avoid doing so. But if we have precomputed it,
696 * it is quicker to use the precomputed version.
698 if (!info
->traverse_path
)
699 return do_compare_entry_piecewise(ce
, info
, n
);
701 cmp
= strncmp(ce
->name
, info
->traverse_path
, info
->pathlen
);
705 pathlen
= info
->pathlen
;
706 ce_len
= ce_namelen(ce
);
708 if (ce_len
< pathlen
)
712 ce_name
= ce
->name
+ pathlen
;
714 len
= tree_entry_len(n
);
715 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
718 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
720 int cmp
= do_compare_entry(ce
, info
, n
);
725 * Even if the beginning compared identically, the ce should
726 * compare as bigger than a directory leading up to it!
728 return ce_namelen(ce
) > traverse_path_len(info
, n
);
731 static int ce_in_traverse_path(const struct cache_entry
*ce
,
732 const struct traverse_info
*info
)
736 if (do_compare_entry(ce
, info
->prev
, &info
->name
))
739 * If ce (blob) is the same name as the path (which is a tree
740 * we will be descending into), it won't be inside it.
742 return (info
->pathlen
< ce_namelen(ce
));
745 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
, const struct name_entry
*n
, int stage
)
747 int len
= traverse_path_len(info
, n
);
748 struct cache_entry
*ce
= xcalloc(1, cache_entry_size(len
));
750 ce
->ce_mode
= create_ce_mode(n
->mode
);
751 ce
->ce_flags
= create_ce_flags(stage
);
752 ce
->ce_namelen
= len
;
753 oidcpy(&ce
->oid
, n
->oid
);
754 make_traverse_path(ce
->name
, info
, n
);
759 static int unpack_nondirectories(int n
, unsigned long mask
,
760 unsigned long dirmask
,
761 struct cache_entry
**src
,
762 const struct name_entry
*names
,
763 const struct traverse_info
*info
)
766 struct unpack_trees_options
*o
= info
->data
;
767 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
769 /* Do we have *only* directories? Nothing to do */
770 if (mask
== dirmask
&& !src
[0])
774 * Ok, we've filled in up to any potential index entry in src[0],
777 for (i
= 0; i
< n
; i
++) {
779 unsigned int bit
= 1ul << i
;
780 if (conflicts
& bit
) {
781 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
788 else if (i
+ 1 < o
->head_idx
)
790 else if (i
+ 1 > o
->head_idx
)
794 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
);
798 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
800 for (i
= 0; i
< n
; i
++) {
801 struct cache_entry
*ce
= src
[i
+ o
->merge
];
802 if (ce
!= o
->df_conflict_entry
)
808 for (i
= 0; i
< n
; i
++)
809 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
810 if (do_add_entry(o
, src
[i
], 0, 0))
816 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
818 discard_index(&o
->result
);
819 if (!o
->gently
&& !o
->exiting_early
) {
821 return error("%s", message
);
828 * The tree traversal is looking at name p. If we have a matching entry,
829 * return it. If name p is a directory in the index, do not return
830 * anything, as we will want to match it when the traversal descends into
833 static int find_cache_pos(struct traverse_info
*info
,
834 const struct name_entry
*p
)
837 struct unpack_trees_options
*o
= info
->data
;
838 struct index_state
*index
= o
->src_index
;
839 int pfxlen
= info
->pathlen
;
840 int p_len
= tree_entry_len(p
);
842 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
843 const struct cache_entry
*ce
= index
->cache
[pos
];
844 const char *ce_name
, *ce_slash
;
847 if (ce
->ce_flags
& CE_UNPACKED
) {
849 * cache_bottom entry is already unpacked, so
850 * we can never match it; don't check it
853 if (pos
== o
->cache_bottom
)
857 if (!ce_in_traverse_path(ce
, info
)) {
859 * Check if we can skip future cache checks
860 * (because we're already past all possible
861 * entries in the traverse path).
863 if (info
->traverse_path
) {
864 if (strncmp(ce
->name
, info
->traverse_path
,
870 ce_name
= ce
->name
+ pfxlen
;
871 ce_slash
= strchr(ce_name
, '/');
873 ce_len
= ce_slash
- ce_name
;
875 ce_len
= ce_namelen(ce
) - pfxlen
;
876 cmp
= name_compare(p
->path
, p_len
, ce_name
, ce_len
);
878 * Exact match; if we have a directory we need to
879 * delay returning it.
882 return ce_slash
? -2 - pos
: pos
;
884 continue; /* keep looking */
886 * ce_name sorts after p->path; could it be that we
887 * have files under p->path directory in the index?
888 * E.g. ce_name == "t-i", and p->path == "t"; we may
889 * have "t/a" in the index.
891 if (p_len
< ce_len
&& !memcmp(ce_name
, p
->path
, p_len
) &&
892 ce_name
[p_len
] < '/')
893 continue; /* keep looking */
899 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
900 const struct name_entry
*p
)
902 int pos
= find_cache_pos(info
, p
);
903 struct unpack_trees_options
*o
= info
->data
;
906 return o
->src_index
->cache
[pos
];
911 static void debug_path(struct traverse_info
*info
)
914 debug_path(info
->prev
);
915 if (*info
->prev
->name
.path
)
918 printf("%s", info
->name
.path
);
921 static void debug_name_entry(int i
, struct name_entry
*n
)
923 printf("ent#%d %06o %s\n", i
,
924 n
->path
? n
->mode
: 0,
925 n
->path
? n
->path
: "(missing)");
928 static void debug_unpack_callback(int n
,
930 unsigned long dirmask
,
931 struct name_entry
*names
,
932 struct traverse_info
*info
)
935 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
939 for (i
= 0; i
< n
; i
++)
940 debug_name_entry(i
, names
+ i
);
943 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
945 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
946 struct unpack_trees_options
*o
= info
->data
;
947 const struct name_entry
*p
= names
;
949 /* Find first entry with a real name (we could use "mask" too) */
954 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
956 /* Are we supposed to look at the index too? */
960 struct cache_entry
*ce
;
962 if (o
->diff_index_cached
)
963 ce
= next_cache_entry(o
);
965 ce
= find_cache_entry(info
, p
);
969 cmp
= compare_entry(ce
, info
, p
);
971 if (unpack_index_entry(ce
, o
) < 0)
972 return unpack_failed(o
, NULL
);
978 * If we skip unmerged index
979 * entries, we'll skip this
980 * entry *and* the tree
981 * entries associated with it!
983 if (o
->skip_unmerged
) {
984 add_same_unmerged(ce
, o
);
994 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
997 if (o
->merge
&& src
[0]) {
998 if (ce_stage(src
[0]))
999 mark_ce_used_same_name(src
[0], o
);
1001 mark_ce_used(src
[0], o
);
1004 /* Now handle any directories.. */
1006 /* special case: "diff-index --cached" looking at a tree */
1007 if (o
->diff_index_cached
&&
1008 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
1010 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
1013 * Everything under the name matches; skip the
1014 * entire hierarchy. diff_index_cached codepath
1015 * special cases D/F conflicts in such a way that
1016 * it does not do any look-ahead, so this is safe.
1019 o
->cache_bottom
+= matches
;
1024 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
1033 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1034 struct strbuf
*prefix
,
1035 int select_mask
, int clear_mask
,
1036 struct exclude_list
*el
, int defval
);
1038 /* Whole directory matching */
1039 static int clear_ce_flags_dir(struct cache_entry
**cache
, int nr
,
1040 struct strbuf
*prefix
,
1042 int select_mask
, int clear_mask
,
1043 struct exclude_list
*el
, int defval
)
1045 struct cache_entry
**cache_end
;
1047 int ret
= is_excluded_from_list(prefix
->buf
, prefix
->len
,
1048 basename
, &dtype
, el
);
1051 strbuf_addch(prefix
, '/');
1053 /* If undecided, use matching result of parent dir in defval */
1057 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
1058 struct cache_entry
*ce
= *cache_end
;
1059 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1064 * TODO: check el, if there are no patterns that may conflict
1065 * with ret (iow, we know in advance the incl/excl
1066 * decision for the entire directory), clear flag here without
1067 * calling clear_ce_flags_1(). That function will call
1068 * the expensive is_excluded_from_list() on every entry.
1070 rc
= clear_ce_flags_1(cache
, cache_end
- cache
,
1072 select_mask
, clear_mask
,
1074 strbuf_setlen(prefix
, prefix
->len
- 1);
1079 * Traverse the index, find every entry that matches according to
1080 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
1081 * number of traversed entries.
1083 * If select_mask is non-zero, only entries whose ce_flags has on of
1084 * those bits enabled are traversed.
1086 * cache : pointer to an index entry
1087 * prefix_len : an offset to its path
1089 * The current path ("prefix") including the trailing '/' is
1090 * cache[0]->name[0..(prefix_len-1)]
1091 * Top level path has prefix_len zero.
1093 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
1094 struct strbuf
*prefix
,
1095 int select_mask
, int clear_mask
,
1096 struct exclude_list
*el
, int defval
)
1098 struct cache_entry
**cache_end
= cache
+ nr
;
1101 * Process all entries that have the given prefix and meet
1102 * select_mask condition
1104 while(cache
!= cache_end
) {
1105 struct cache_entry
*ce
= *cache
;
1106 const char *name
, *slash
;
1107 int len
, dtype
, ret
;
1109 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
1114 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
1117 name
= ce
->name
+ prefix
->len
;
1118 slash
= strchr(name
, '/');
1120 /* If it's a directory, try whole directory match first */
1125 strbuf_add(prefix
, name
, len
);
1127 processed
= clear_ce_flags_dir(cache
, cache_end
- cache
,
1129 prefix
->buf
+ prefix
->len
- len
,
1130 select_mask
, clear_mask
,
1133 /* clear_c_f_dir eats a whole dir already? */
1136 strbuf_setlen(prefix
, prefix
->len
- len
);
1140 strbuf_addch(prefix
, '/');
1141 cache
+= clear_ce_flags_1(cache
, cache_end
- cache
,
1143 select_mask
, clear_mask
, el
, defval
);
1144 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
1149 dtype
= ce_to_dtype(ce
);
1150 ret
= is_excluded_from_list(ce
->name
, ce_namelen(ce
),
1155 ce
->ce_flags
&= ~clear_mask
;
1158 return nr
- (cache_end
- cache
);
1161 static int clear_ce_flags(struct cache_entry
**cache
, int nr
,
1162 int select_mask
, int clear_mask
,
1163 struct exclude_list
*el
)
1165 static struct strbuf prefix
= STRBUF_INIT
;
1167 strbuf_reset(&prefix
);
1169 return clear_ce_flags_1(cache
, nr
,
1171 select_mask
, clear_mask
,
1176 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
1178 static void mark_new_skip_worktree(struct exclude_list
*el
,
1179 struct index_state
*the_index
,
1180 int select_flag
, int skip_wt_flag
)
1185 * 1. Pretend the narrowest worktree: only unmerged entries
1188 for (i
= 0; i
< the_index
->cache_nr
; i
++) {
1189 struct cache_entry
*ce
= the_index
->cache
[i
];
1191 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
1195 ce
->ce_flags
|= skip_wt_flag
;
1197 ce
->ce_flags
&= ~skip_wt_flag
;
1201 * 2. Widen worktree according to sparse-checkout file.
1202 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1204 clear_ce_flags(the_index
->cache
, the_index
->cache_nr
,
1205 select_flag
, skip_wt_flag
, el
);
1208 static int verify_absent(const struct cache_entry
*,
1209 enum unpack_trees_error_types
,
1210 struct unpack_trees_options
*);
1212 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1213 * resulting index, -2 on failure to reflect the changes to the work tree.
1215 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1217 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1220 static struct cache_entry
*dfc
;
1221 struct exclude_list el
;
1223 if (len
> MAX_UNPACK_TREES
)
1224 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1226 memset(&el
, 0, sizeof(el
));
1227 if (!core_apply_sparse_checkout
|| !o
->update
)
1228 o
->skip_sparse_checkout
= 1;
1229 if (!o
->skip_sparse_checkout
) {
1230 char *sparse
= git_pathdup("info/sparse-checkout");
1231 if (add_excludes_from_file_to_list(sparse
, "", 0, &el
, 0) < 0)
1232 o
->skip_sparse_checkout
= 1;
1238 memset(&o
->result
, 0, sizeof(o
->result
));
1239 o
->result
.initialized
= 1;
1240 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1241 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1242 o
->result
.version
= o
->src_index
->version
;
1243 o
->result
.split_index
= o
->src_index
->split_index
;
1244 if (o
->result
.split_index
)
1245 o
->result
.split_index
->refcount
++;
1246 hashcpy(o
->result
.sha1
, o
->src_index
->sha1
);
1247 o
->merge_size
= len
;
1248 mark_all_ce_unused(o
->src_index
);
1251 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1253 if (!o
->skip_sparse_checkout
)
1254 mark_new_skip_worktree(o
->el
, o
->src_index
, 0, CE_NEW_SKIP_WORKTREE
);
1257 dfc
= xcalloc(1, cache_entry_size(0));
1258 o
->df_conflict_entry
= dfc
;
1261 const char *prefix
= o
->prefix
? o
->prefix
: "";
1262 struct traverse_info info
;
1264 setup_traverse_info(&info
, prefix
);
1265 info
.fn
= unpack_callback
;
1267 info
.show_all_errors
= o
->show_all_errors
;
1268 info
.pathspec
= o
->pathspec
;
1272 * Unpack existing index entries that sort before the
1273 * prefix the tree is spliced into. Note that o->merge
1274 * is always true in this case.
1277 struct cache_entry
*ce
= next_cache_entry(o
);
1280 if (ce_in_traverse_path(ce
, &info
))
1282 if (unpack_index_entry(ce
, o
) < 0)
1287 if (traverse_trees(len
, t
, &info
) < 0)
1291 /* Any left-over entries in the index? */
1294 struct cache_entry
*ce
= next_cache_entry(o
);
1297 if (unpack_index_entry(ce
, o
) < 0)
1301 mark_all_ce_unused(o
->src_index
);
1303 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1304 ret
= unpack_failed(o
, "Merge requires file-level merging");
1308 if (!o
->skip_sparse_checkout
) {
1309 int empty_worktree
= 1;
1312 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1313 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1314 * so apply_sparse_checkout() won't attempt to remove it from worktree
1316 mark_new_skip_worktree(o
->el
, &o
->result
, CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1319 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1320 struct cache_entry
*ce
= o
->result
.cache
[i
];
1323 * Entries marked with CE_ADDED in merged_entry() do not have
1324 * verify_absent() check (the check is effectively disabled
1325 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1327 * Do the real check now because we have had
1328 * correct CE_NEW_SKIP_WORKTREE
1330 if (ce
->ce_flags
& CE_ADDED
&&
1331 verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1332 if (!o
->show_all_errors
)
1337 if (apply_sparse_checkout(&o
->result
, ce
, o
)) {
1338 if (!o
->show_all_errors
)
1342 if (!ce_skip_worktree(ce
))
1349 * Sparse checkout is meant to narrow down checkout area
1350 * but it does not make sense to narrow down to empty working
1351 * tree. This is usually a mistake in sparse checkout rules.
1352 * Do not allow users to do that.
1354 if (o
->result
.cache_nr
&& empty_worktree
) {
1355 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1360 o
->src_index
= NULL
;
1361 ret
= check_updates(o
) ? (-2) : 0;
1364 if (!o
->result
.cache_tree
)
1365 o
->result
.cache_tree
= cache_tree();
1366 if (!cache_tree_fully_valid(o
->result
.cache_tree
))
1367 cache_tree_update(&o
->result
,
1371 discard_index(o
->dst_index
);
1372 *o
->dst_index
= o
->result
;
1374 discard_index(&o
->result
);
1378 clear_exclude_list(&el
);
1382 if (o
->show_all_errors
)
1383 display_error_msgs(o
);
1384 mark_all_ce_unused(o
->src_index
);
1385 ret
= unpack_failed(o
, NULL
);
1386 if (o
->exiting_early
)
1391 /* Here come the merge functions */
1393 static int reject_merge(const struct cache_entry
*ce
,
1394 struct unpack_trees_options
*o
)
1396 return o
->gently
? -1 :
1397 add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1400 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1406 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1408 return a
->ce_mode
== b
->ce_mode
&&
1409 !oidcmp(&a
->oid
, &b
->oid
);
1414 * When a CE gets turned into an unmerged entry, we
1415 * want it to be up-to-date
1417 static int verify_uptodate_1(const struct cache_entry
*ce
,
1418 struct unpack_trees_options
*o
,
1419 enum unpack_trees_error_types error_type
)
1427 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1428 * if this entry is truly up-to-date because this file may be
1431 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1432 ; /* keep checking */
1433 else if (o
->reset
|| ce_uptodate(ce
))
1436 if (!lstat(ce
->name
, &st
)) {
1437 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1438 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1440 if (submodule_from_ce(ce
)) {
1441 int r
= check_submodule_move_head(ce
,
1442 "HEAD", oid_to_hex(&ce
->oid
), o
);
1444 return o
->gently
? -1 :
1445 add_rejected_path(o
, error_type
, ce
->name
);
1452 * Historic default policy was to allow submodule to be out
1453 * of sync wrt the superproject index. If the submodule was
1454 * not considered interesting above, we don't care here.
1456 if (S_ISGITLINK(ce
->ce_mode
))
1461 if (errno
== ENOENT
)
1463 return o
->gently
? -1 :
1464 add_rejected_path(o
, error_type
, ce
->name
);
1467 static int verify_uptodate(const struct cache_entry
*ce
,
1468 struct unpack_trees_options
*o
)
1470 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1472 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1475 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1476 struct unpack_trees_options
*o
)
1478 return verify_uptodate_1(ce
, o
, ERROR_SPARSE_NOT_UPTODATE_FILE
);
1481 static void invalidate_ce_path(const struct cache_entry
*ce
,
1482 struct unpack_trees_options
*o
)
1486 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1487 untracked_cache_invalidate_path(o
->src_index
, ce
->name
);
1491 * Check that checking out ce->sha1 in subdir ce->name is not
1492 * going to overwrite any working files.
1494 * Currently, git does not checkout subprojects during a superproject
1495 * checkout, so it is not going to overwrite anything.
1497 static int verify_clean_submodule(const char *old_sha1
,
1498 const struct cache_entry
*ce
,
1499 enum unpack_trees_error_types error_type
,
1500 struct unpack_trees_options
*o
)
1502 if (!submodule_from_ce(ce
))
1505 return check_submodule_move_head(ce
, old_sha1
,
1506 oid_to_hex(&ce
->oid
), o
);
1509 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1510 enum unpack_trees_error_types error_type
,
1511 struct unpack_trees_options
*o
)
1514 * we are about to extract "ce->name"; we would not want to lose
1515 * anything in the existing directory there.
1519 struct dir_struct d
;
1523 if (S_ISGITLINK(ce
->ce_mode
)) {
1524 unsigned char sha1
[20];
1525 int sub_head
= resolve_gitlink_ref(ce
->name
, "HEAD", sha1
);
1527 * If we are not going to update the submodule, then
1530 if (!sub_head
&& !hashcmp(sha1
, ce
->oid
.hash
))
1532 return verify_clean_submodule(sub_head
? NULL
: sha1_to_hex(sha1
),
1537 * First let's make sure we do not have a local modification
1538 * in that directory.
1540 namelen
= ce_namelen(ce
);
1541 for (i
= locate_in_src_index(ce
, o
);
1542 i
< o
->src_index
->cache_nr
;
1544 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1545 int len
= ce_namelen(ce2
);
1546 if (len
< namelen
||
1547 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1548 ce2
->name
[namelen
] != '/')
1551 * ce2->name is an entry in the subdirectory to be
1554 if (!ce_stage(ce2
)) {
1555 if (verify_uptodate(ce2
, o
))
1557 add_entry(o
, ce2
, CE_REMOVE
, 0);
1558 mark_ce_used(ce2
, o
);
1564 * Then we need to make sure that we do not lose a locally
1565 * present file that is not ignored.
1567 pathbuf
= xstrfmt("%.*s/", namelen
, ce
->name
);
1569 memset(&d
, 0, sizeof(d
));
1571 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
1572 i
= read_directory(&d
, pathbuf
, namelen
+1, NULL
);
1574 return o
->gently
? -1 :
1575 add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
1581 * This gets called when there was no index entry for the tree entry 'dst',
1582 * but we found a file in the working tree that 'lstat()' said was fine,
1583 * and we're on a case-insensitive filesystem.
1585 * See if we can find a case-insensitive match in the index that also
1586 * matches the stat information, and assume it's that other file!
1588 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
1590 const struct cache_entry
*src
;
1592 src
= index_file_exists(o
->src_index
, name
, len
, 1);
1593 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
1596 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
1597 const struct cache_entry
*ce
, struct stat
*st
,
1598 enum unpack_trees_error_types error_type
,
1599 struct unpack_trees_options
*o
)
1601 const struct cache_entry
*result
;
1604 * It may be that the 'lstat()' succeeded even though
1605 * target 'ce' was absent, because there is an old
1606 * entry that is different only in case..
1608 * Ignore that lstat() if it matches.
1610 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
1614 is_excluded(o
->dir
, name
, &dtype
))
1616 * ce->name is explicitly excluded, so it is Ok to
1620 if (S_ISDIR(st
->st_mode
)) {
1622 * We are checking out path "foo" and
1623 * found "foo/." in the working tree.
1624 * This is tricky -- if we have modified
1625 * files that are in "foo/" we would lose
1628 if (verify_clean_subdirectory(ce
, error_type
, o
) < 0)
1634 * The previous round may already have decided to
1635 * delete this path, which is in a subdirectory that
1636 * is being replaced with a blob.
1638 result
= index_file_exists(&o
->result
, name
, len
, 0);
1640 if (result
->ce_flags
& CE_REMOVE
)
1644 return o
->gently
? -1 :
1645 add_rejected_path(o
, error_type
, name
);
1649 * We do not want to remove or overwrite a working tree file that
1650 * is not tracked, unless it is ignored.
1652 static int verify_absent_1(const struct cache_entry
*ce
,
1653 enum unpack_trees_error_types error_type
,
1654 struct unpack_trees_options
*o
)
1659 if (o
->index_only
|| o
->reset
|| !o
->update
)
1662 len
= check_leading_path(ce
->name
, ce_namelen(ce
));
1669 path
= xmemdupz(ce
->name
, len
);
1670 if (lstat(path
, &st
))
1671 ret
= error_errno("cannot stat '%s'", path
);
1673 if (submodule_from_ce(ce
))
1674 ret
= check_submodule_move_head(ce
,
1675 oid_to_hex(&ce
->oid
),
1678 ret
= check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
,
1679 &st
, error_type
, o
);
1683 } else if (lstat(ce
->name
, &st
)) {
1684 if (errno
!= ENOENT
)
1685 return error_errno("cannot stat '%s'", ce
->name
);
1688 if (submodule_from_ce(ce
))
1689 return check_submodule_move_head(ce
, oid_to_hex(&ce
->oid
),
1692 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
1693 ce_to_dtype(ce
), ce
, &st
,
1698 static int verify_absent(const struct cache_entry
*ce
,
1699 enum unpack_trees_error_types error_type
,
1700 struct unpack_trees_options
*o
)
1702 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1704 return verify_absent_1(ce
, error_type
, o
);
1707 static int verify_absent_sparse(const struct cache_entry
*ce
,
1708 enum unpack_trees_error_types error_type
,
1709 struct unpack_trees_options
*o
)
1711 enum unpack_trees_error_types orphaned_error
= error_type
;
1712 if (orphaned_error
== ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
)
1713 orphaned_error
= ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
;
1715 return verify_absent_1(ce
, orphaned_error
, o
);
1718 static int merged_entry(const struct cache_entry
*ce
,
1719 const struct cache_entry
*old
,
1720 struct unpack_trees_options
*o
)
1722 int update
= CE_UPDATE
;
1723 struct cache_entry
*merge
= dup_entry(ce
);
1727 * New index entries. In sparse checkout, the following
1728 * verify_absent() will be delayed until after
1729 * traverse_trees() finishes in unpack_trees(), then:
1731 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1732 * - verify_absent() be called again, this time with
1733 * correct CE_NEW_SKIP_WORKTREE
1735 * verify_absent() call here does nothing in sparse
1736 * checkout (i.e. o->skip_sparse_checkout == 0)
1739 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
1741 if (verify_absent(merge
,
1742 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1746 invalidate_ce_path(merge
, o
);
1748 if (submodule_from_ce(ce
)) {
1749 int ret
= check_submodule_move_head(ce
, NULL
,
1750 oid_to_hex(&ce
->oid
),
1756 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
1758 * See if we can re-use the old CE directly?
1759 * That way we get the uptodate stat info.
1761 * This also removes the UPDATE flag on a match; otherwise
1762 * we will end up overwriting local changes in the work tree.
1764 if (same(old
, merge
)) {
1765 copy_cache_entry(merge
, old
);
1768 if (verify_uptodate(old
, o
)) {
1772 /* Migrate old flags over */
1773 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1774 invalidate_ce_path(old
, o
);
1777 if (submodule_from_ce(ce
)) {
1778 int ret
= check_submodule_move_head(ce
, oid_to_hex(&old
->oid
),
1779 oid_to_hex(&ce
->oid
),
1786 * Previously unmerged entry left as an existence
1787 * marker by read_index_unmerged();
1789 invalidate_ce_path(old
, o
);
1792 do_add_entry(o
, merge
, update
, CE_STAGEMASK
);
1796 static int deleted_entry(const struct cache_entry
*ce
,
1797 const struct cache_entry
*old
,
1798 struct unpack_trees_options
*o
)
1800 /* Did it exist in the index? */
1802 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1806 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
1808 add_entry(o
, ce
, CE_REMOVE
, 0);
1809 invalidate_ce_path(ce
, o
);
1813 static int keep_entry(const struct cache_entry
*ce
,
1814 struct unpack_trees_options
*o
)
1816 add_entry(o
, ce
, 0, 0);
1821 static void show_stage_entry(FILE *o
,
1822 const char *label
, const struct cache_entry
*ce
)
1825 fprintf(o
, "%s (missing)\n", label
);
1827 fprintf(o
, "%s%06o %s %d\t%s\n",
1830 oid_to_hex(&ce
->oid
),
1836 int threeway_merge(const struct cache_entry
* const *stages
,
1837 struct unpack_trees_options
*o
)
1839 const struct cache_entry
*index
;
1840 const struct cache_entry
*head
;
1841 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
1844 int remote_match
= 0;
1846 int df_conflict_head
= 0;
1847 int df_conflict_remote
= 0;
1849 int any_anc_missing
= 0;
1850 int no_anc_exists
= 1;
1853 for (i
= 1; i
< o
->head_idx
; i
++) {
1854 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
1855 any_anc_missing
= 1;
1861 head
= stages
[o
->head_idx
];
1863 if (head
== o
->df_conflict_entry
) {
1864 df_conflict_head
= 1;
1868 if (remote
== o
->df_conflict_entry
) {
1869 df_conflict_remote
= 1;
1874 * First, if there's a #16 situation, note that to prevent #13
1877 if (!same(remote
, head
)) {
1878 for (i
= 1; i
< o
->head_idx
; i
++) {
1879 if (same(stages
[i
], head
)) {
1882 if (same(stages
[i
], remote
)) {
1889 * We start with cases where the index is allowed to match
1890 * something other than the head: #14(ALT) and #2ALT, where it
1891 * is permitted to match the result instead.
1893 /* #14, #14ALT, #2ALT */
1894 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
1895 if (index
&& !same(index
, remote
) && !same(index
, head
))
1896 return reject_merge(index
, o
);
1897 return merged_entry(remote
, index
, o
);
1900 * If we have an entry in the index cache, then we want to
1901 * make sure that it matches head.
1903 if (index
&& !same(index
, head
))
1904 return reject_merge(index
, o
);
1908 if (same(head
, remote
))
1909 return merged_entry(head
, index
, o
);
1911 if (!df_conflict_remote
&& remote_match
&& !head_match
)
1912 return merged_entry(head
, index
, o
);
1916 if (!head
&& !remote
&& any_anc_missing
)
1920 * Under the "aggressive" rule, we resolve mostly trivial
1921 * cases that we historically had git-merge-one-file resolve.
1923 if (o
->aggressive
) {
1924 int head_deleted
= !head
;
1925 int remote_deleted
= !remote
;
1926 const struct cache_entry
*ce
= NULL
;
1935 for (i
= 1; i
< o
->head_idx
; i
++) {
1936 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1945 * Deleted in one and unchanged in the other.
1947 if ((head_deleted
&& remote_deleted
) ||
1948 (head_deleted
&& remote
&& remote_match
) ||
1949 (remote_deleted
&& head
&& head_match
)) {
1951 return deleted_entry(index
, index
, o
);
1952 if (ce
&& !head_deleted
) {
1953 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1959 * Added in both, identically.
1961 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
1962 return merged_entry(head
, index
, o
);
1966 /* Below are "no merge" cases, which require that the index be
1967 * up-to-date to avoid the files getting overwritten with
1968 * conflict resolution files.
1971 if (verify_uptodate(index
, o
))
1975 o
->nontrivial_merge
= 1;
1977 /* #2, #3, #4, #6, #7, #9, #10, #11. */
1979 if (!head_match
|| !remote_match
) {
1980 for (i
= 1; i
< o
->head_idx
; i
++) {
1981 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1982 keep_entry(stages
[i
], o
);
1990 fprintf(stderr
, "read-tree: warning #16 detected\n");
1991 show_stage_entry(stderr
, "head ", stages
[head_match
]);
1992 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
1995 if (head
) { count
+= keep_entry(head
, o
); }
1996 if (remote
) { count
+= keep_entry(remote
, o
); }
2003 * The rule is to "carry forward" what is in the index without losing
2004 * information across a "fast-forward", favoring a successful merge
2005 * over a merge failure when it makes sense. For details of the
2006 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
2009 int twoway_merge(const struct cache_entry
* const *src
,
2010 struct unpack_trees_options
*o
)
2012 const struct cache_entry
*current
= src
[0];
2013 const struct cache_entry
*oldtree
= src
[1];
2014 const struct cache_entry
*newtree
= src
[2];
2016 if (o
->merge_size
!= 2)
2017 return error("Cannot do a twoway merge of %d trees",
2020 if (oldtree
== o
->df_conflict_entry
)
2022 if (newtree
== o
->df_conflict_entry
)
2026 if (current
->ce_flags
& CE_CONFLICTED
) {
2027 if (same(oldtree
, newtree
) || o
->reset
) {
2029 return deleted_entry(current
, current
, o
);
2031 return merged_entry(newtree
, current
, o
);
2033 return reject_merge(current
, o
);
2034 } else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
2035 (!oldtree
&& newtree
&&
2036 same(current
, newtree
)) || /* 6 and 7 */
2037 (oldtree
&& newtree
&&
2038 same(oldtree
, newtree
)) || /* 14 and 15 */
2039 (oldtree
&& newtree
&&
2040 !same(oldtree
, newtree
) && /* 18 and 19 */
2041 same(current
, newtree
))) {
2042 return keep_entry(current
, o
);
2043 } else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
2045 return deleted_entry(oldtree
, current
, o
);
2046 } else if (oldtree
&& newtree
&&
2047 same(current
, oldtree
) && !same(current
, newtree
)) {
2049 return merged_entry(newtree
, current
, o
);
2051 return reject_merge(current
, o
);
2054 if (oldtree
&& !o
->initial_checkout
) {
2056 * deletion of the path was staged;
2058 if (same(oldtree
, newtree
))
2060 return reject_merge(oldtree
, o
);
2062 return merged_entry(newtree
, current
, o
);
2064 return deleted_entry(oldtree
, current
, o
);
2070 * Keep the index entries at stage0, collapse stage1 but make sure
2071 * stage0 does not have anything there.
2073 int bind_merge(const struct cache_entry
* const *src
,
2074 struct unpack_trees_options
*o
)
2076 const struct cache_entry
*old
= src
[0];
2077 const struct cache_entry
*a
= src
[1];
2079 if (o
->merge_size
!= 1)
2080 return error("Cannot do a bind merge of %d trees",
2083 return o
->gently
? -1 :
2084 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
),
2085 super_prefixed(a
->name
),
2086 super_prefixed(old
->name
));
2088 return keep_entry(old
, o
);
2090 return merged_entry(a
, NULL
, o
);
2097 * - take the stat information from stage0, take the data from stage1
2099 int oneway_merge(const struct cache_entry
* const *src
,
2100 struct unpack_trees_options
*o
)
2102 const struct cache_entry
*old
= src
[0];
2103 const struct cache_entry
*a
= src
[1];
2105 if (o
->merge_size
!= 1)
2106 return error("Cannot do a oneway merge of %d trees",
2109 if (!a
|| a
== o
->df_conflict_entry
)
2110 return deleted_entry(old
, old
, o
);
2112 if (old
&& same(old
, a
)) {
2114 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
)) {
2116 if (lstat(old
->name
, &st
) ||
2117 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
2118 update
|= CE_UPDATE
;
2120 add_entry(o
, old
, update
, 0);
2123 return merged_entry(a
, old
, o
);