1 #define NO_THE_INDEX_COMPATIBILITY_MACROS
6 #include "cache-tree.h"
7 #include "unpack-trees.h"
13 * Error messages expected by scripts out of plumbing commands such as
14 * read-tree. Non-scripted Porcelain is not required to use these messages
15 * and in fact are encouraged to reword them to better suit their particular
16 * situation better. See how "git checkout" replaces not_uptodate_file to
17 * explain why it does not allow switching between branches when you have
18 * local changes, for example.
20 static struct unpack_trees_error_msgs unpack_plumbing_errors
= {
22 "Entry '%s' would be overwritten by merge. Cannot merge.",
24 /* not_uptodate_file */
25 "Entry '%s' not uptodate. Cannot merge.",
27 /* not_uptodate_dir */
28 "Updating '%s' would lose untracked files in it",
30 /* would_lose_untracked */
31 "Untracked working tree file '%s' would be %s by merge.",
34 "Entry '%s' overlaps with '%s'. Cannot bind.",
36 /* sparse_not_uptodate_file */
37 "Entry '%s' not uptodate. Cannot update sparse checkout.",
39 /* would_lose_orphaned */
40 "Working tree file '%s' would be %s by sparse checkout update.",
43 #define ERRORMSG(o,fld) \
44 ( ((o) && (o)->msgs.fld) \
46 : (unpack_plumbing_errors.fld) )
48 static void add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
49 unsigned int set
, unsigned int clear
)
51 unsigned int size
= ce_size(ce
);
52 struct cache_entry
*new = xmalloc(size
);
54 clear
|= CE_HASHED
| CE_UNHASHED
;
56 memcpy(new, ce
, size
);
58 new->ce_flags
= (new->ce_flags
& ~clear
) | set
;
59 add_index_entry(&o
->result
, new, ADD_CACHE_OK_TO_ADD
|ADD_CACHE_OK_TO_REPLACE
);
63 * Unlink the last component and schedule the leading directories for
64 * removal, such that empty directories get removed.
66 static void unlink_entry(struct cache_entry
*ce
)
68 if (has_symlink_or_noent_leading_path(ce
->name
, ce_namelen(ce
)))
70 if (S_ISGITLINK(ce
->ce_mode
)) {
71 if (rmdir(ce
->name
)) {
72 warning("unable to rmdir %s: %s",
73 ce
->name
, strerror(errno
));
78 if (unlink_or_warn(ce
->name
))
80 schedule_dir_for_removal(ce
->name
, ce_namelen(ce
));
83 static struct checkout state
;
84 static int check_updates(struct unpack_trees_options
*o
)
86 unsigned cnt
= 0, total
= 0;
87 struct progress
*progress
= NULL
;
88 struct index_state
*index
= &o
->result
;
92 if (o
->update
&& o
->verbose_update
) {
93 for (total
= cnt
= 0; cnt
< index
->cache_nr
; cnt
++) {
94 struct cache_entry
*ce
= index
->cache
[cnt
];
95 if (ce
->ce_flags
& (CE_UPDATE
| CE_REMOVE
| CE_WT_REMOVE
))
99 progress
= start_progress_delay("Checking out files",
105 git_attr_set_direction(GIT_ATTR_CHECKOUT
, &o
->result
);
106 for (i
= 0; i
< index
->cache_nr
; i
++) {
107 struct cache_entry
*ce
= index
->cache
[i
];
109 if (ce
->ce_flags
& CE_WT_REMOVE
) {
110 display_progress(progress
, ++cnt
);
116 if (ce
->ce_flags
& CE_REMOVE
) {
117 display_progress(progress
, ++cnt
);
122 remove_marked_cache_entries(&o
->result
);
123 remove_scheduled_dirs();
125 for (i
= 0; i
< index
->cache_nr
; i
++) {
126 struct cache_entry
*ce
= index
->cache
[i
];
128 if (ce
->ce_flags
& CE_UPDATE
) {
129 display_progress(progress
, ++cnt
);
130 ce
->ce_flags
&= ~CE_UPDATE
;
132 errs
|= checkout_entry(ce
, &state
, NULL
);
136 stop_progress(&progress
);
138 git_attr_set_direction(GIT_ATTR_CHECKIN
, NULL
);
142 static int verify_uptodate_sparse(struct cache_entry
*ce
, struct unpack_trees_options
*o
);
143 static int verify_absent_sparse(struct cache_entry
*ce
, const char *action
, struct unpack_trees_options
*o
);
145 static int will_have_skip_worktree(const struct cache_entry
*ce
, struct unpack_trees_options
*o
)
147 const char *basename
;
152 basename
= strrchr(ce
->name
, '/');
153 basename
= basename
? basename
+1 : ce
->name
;
154 return excluded_from_list(ce
->name
, ce_namelen(ce
), basename
, NULL
, o
->el
) <= 0;
157 static int apply_sparse_checkout(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
159 int was_skip_worktree
= ce_skip_worktree(ce
);
161 if (will_have_skip_worktree(ce
, o
))
162 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
164 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
167 * We only care about files getting into the checkout area
168 * If merge strategies want to remove some, go ahead, this
169 * flag will be removed eventually in unpack_trees() if it's
170 * outside checkout area.
172 if (ce
->ce_flags
& CE_REMOVE
)
175 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
177 * If CE_UPDATE is set, verify_uptodate() must be called already
178 * also stat info may have lost after merged_entry() so calling
179 * verify_uptodate() again may fail
181 if (!(ce
->ce_flags
& CE_UPDATE
) && verify_uptodate_sparse(ce
, o
))
183 ce
->ce_flags
|= CE_WT_REMOVE
;
185 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
186 if (verify_absent_sparse(ce
, "overwritten", o
))
188 ce
->ce_flags
|= CE_UPDATE
;
193 static inline int call_unpack_fn(struct cache_entry
**src
, struct unpack_trees_options
*o
)
195 int ret
= o
->fn(src
, o
);
201 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
203 ce
->ce_flags
|= CE_UNPACKED
;
205 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
206 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
207 int bottom
= o
->cache_bottom
;
208 while (bottom
< o
->src_index
->cache_nr
&&
209 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
211 o
->cache_bottom
= bottom
;
215 static void mark_all_ce_unused(struct index_state
*index
)
218 for (i
= 0; i
< index
->cache_nr
; i
++)
219 index
->cache
[i
]->ce_flags
&= ~CE_UNPACKED
;
222 static int locate_in_src_index(struct cache_entry
*ce
,
223 struct unpack_trees_options
*o
)
225 struct index_state
*index
= o
->src_index
;
226 int len
= ce_namelen(ce
);
227 int pos
= index_name_pos(index
, ce
->name
, len
);
234 * We call unpack_index_entry() with an unmerged cache entry
235 * only in diff-index, and it wants a single callback. Skip
236 * the other unmerged entry with the same name.
238 static void mark_ce_used_same_name(struct cache_entry
*ce
,
239 struct unpack_trees_options
*o
)
241 struct index_state
*index
= o
->src_index
;
242 int len
= ce_namelen(ce
);
245 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
246 struct cache_entry
*next
= index
->cache
[pos
];
247 if (len
!= ce_namelen(next
) ||
248 memcmp(ce
->name
, next
->name
, len
))
250 mark_ce_used(next
, o
);
254 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
256 const struct index_state
*index
= o
->src_index
;
257 int pos
= o
->cache_bottom
;
259 while (pos
< index
->cache_nr
) {
260 struct cache_entry
*ce
= index
->cache
[pos
];
261 if (!(ce
->ce_flags
& CE_UNPACKED
))
268 static void add_same_unmerged(struct cache_entry
*ce
,
269 struct unpack_trees_options
*o
)
271 struct index_state
*index
= o
->src_index
;
272 int len
= ce_namelen(ce
);
273 int pos
= index_name_pos(index
, ce
->name
, len
);
276 die("programming error in a caller of mark_ce_used_same_name");
277 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
278 struct cache_entry
*next
= index
->cache
[pos
];
279 if (len
!= ce_namelen(next
) ||
280 memcmp(ce
->name
, next
->name
, len
))
282 add_entry(o
, next
, 0, 0);
283 mark_ce_used(next
, o
);
287 static int unpack_index_entry(struct cache_entry
*ce
,
288 struct unpack_trees_options
*o
)
290 struct cache_entry
*src
[5] = { ce
, NULL
, };
295 if (o
->skip_unmerged
) {
296 add_entry(o
, ce
, 0, 0);
300 ret
= call_unpack_fn(src
, o
);
302 mark_ce_used_same_name(ce
, o
);
306 static int find_cache_pos(struct traverse_info
*, const struct name_entry
*);
308 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
310 struct unpack_trees_options
*o
= info
->data
;
312 if (o
->diff_index_cached
)
314 o
->cache_bottom
= bottom
;
317 static int switch_cache_bottom(struct traverse_info
*info
)
319 struct unpack_trees_options
*o
= info
->data
;
322 if (o
->diff_index_cached
)
324 ret
= o
->cache_bottom
;
325 pos
= find_cache_pos(info
->prev
, &info
->name
);
328 o
->cache_bottom
= -2 - pos
;
330 o
->cache_bottom
= o
->src_index
->cache_nr
;
334 static int traverse_trees_recursive(int n
, unsigned long dirmask
, unsigned long df_conflicts
, struct name_entry
*names
, struct traverse_info
*info
)
337 struct tree_desc t
[MAX_UNPACK_TREES
];
338 struct traverse_info newinfo
;
339 struct name_entry
*p
;
348 newinfo
.pathlen
+= tree_entry_len(p
->path
, p
->sha1
) + 1;
349 newinfo
.conflicts
|= df_conflicts
;
351 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
352 const unsigned char *sha1
= NULL
;
354 sha1
= names
[i
].sha1
;
355 fill_tree_descriptor(t
+i
, sha1
);
358 bottom
= switch_cache_bottom(&newinfo
);
359 ret
= traverse_trees(n
, t
, &newinfo
);
360 restore_cache_bottom(&newinfo
, bottom
);
365 * Compare the traverse-path to the cache entry without actually
366 * having to generate the textual representation of the traverse
369 * NOTE! This *only* compares up to the size of the traverse path
370 * itself - the caller needs to do the final check for the cache
371 * entry having more data at the end!
373 static int do_compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
375 int len
, pathlen
, ce_len
;
379 int cmp
= do_compare_entry(ce
, info
->prev
, &info
->name
);
383 pathlen
= info
->pathlen
;
384 ce_len
= ce_namelen(ce
);
386 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
387 if (ce_len
< pathlen
)
391 ce_name
= ce
->name
+ pathlen
;
393 len
= tree_entry_len(n
->path
, n
->sha1
);
394 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
397 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
399 int cmp
= do_compare_entry(ce
, info
, n
);
404 * Even if the beginning compared identically, the ce should
405 * compare as bigger than a directory leading up to it!
407 return ce_namelen(ce
) > traverse_path_len(info
, n
);
410 static int ce_in_traverse_path(const struct cache_entry
*ce
,
411 const struct traverse_info
*info
)
415 if (do_compare_entry(ce
, info
->prev
, &info
->name
))
418 * If ce (blob) is the same name as the path (which is a tree
419 * we will be descending into), it won't be inside it.
421 return (info
->pathlen
< ce_namelen(ce
));
424 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
, const struct name_entry
*n
, int stage
)
426 int len
= traverse_path_len(info
, n
);
427 struct cache_entry
*ce
= xcalloc(1, cache_entry_size(len
));
429 ce
->ce_mode
= create_ce_mode(n
->mode
);
430 ce
->ce_flags
= create_ce_flags(len
, stage
);
431 hashcpy(ce
->sha1
, n
->sha1
);
432 make_traverse_path(ce
->name
, info
, n
);
437 static int unpack_nondirectories(int n
, unsigned long mask
,
438 unsigned long dirmask
,
439 struct cache_entry
**src
,
440 const struct name_entry
*names
,
441 const struct traverse_info
*info
)
444 struct unpack_trees_options
*o
= info
->data
;
445 unsigned long conflicts
;
447 /* Do we have *only* directories? Nothing to do */
448 if (mask
== dirmask
&& !src
[0])
451 conflicts
= info
->conflicts
;
454 conflicts
|= dirmask
;
457 * Ok, we've filled in up to any potential index entry in src[0],
460 for (i
= 0; i
< n
; i
++) {
462 unsigned int bit
= 1ul << i
;
463 if (conflicts
& bit
) {
464 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
471 else if (i
+ 1 < o
->head_idx
)
473 else if (i
+ 1 > o
->head_idx
)
477 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
);
481 return call_unpack_fn(src
, o
);
483 for (i
= 0; i
< n
; i
++)
484 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
485 add_entry(o
, src
[i
], 0, 0);
489 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
491 discard_index(&o
->result
);
494 return error("%s", message
);
500 /* NEEDSWORK: give this a better name and share with tree-walk.c */
501 static int name_compare(const char *a
, int a_len
,
502 const char *b
, int b_len
)
504 int len
= (a_len
< b_len
) ? a_len
: b_len
;
505 int cmp
= memcmp(a
, b
, len
);
508 return (a_len
- b_len
);
512 * The tree traversal is looking at name p. If we have a matching entry,
513 * return it. If name p is a directory in the index, do not return
514 * anything, as we will want to match it when the traversal descends into
517 static int find_cache_pos(struct traverse_info
*info
,
518 const struct name_entry
*p
)
521 struct unpack_trees_options
*o
= info
->data
;
522 struct index_state
*index
= o
->src_index
;
523 int pfxlen
= info
->pathlen
;
524 int p_len
= tree_entry_len(p
->path
, p
->sha1
);
526 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
527 struct cache_entry
*ce
= index
->cache
[pos
];
528 const char *ce_name
, *ce_slash
;
531 if (ce
->ce_flags
& CE_UNPACKED
) {
533 * cache_bottom entry is already unpacked, so
534 * we can never match it; don't check it
537 if (pos
== o
->cache_bottom
)
541 if (!ce_in_traverse_path(ce
, info
))
543 ce_name
= ce
->name
+ pfxlen
;
544 ce_slash
= strchr(ce_name
, '/');
546 ce_len
= ce_slash
- ce_name
;
548 ce_len
= ce_namelen(ce
) - pfxlen
;
549 cmp
= name_compare(p
->path
, p_len
, ce_name
, ce_len
);
551 * Exact match; if we have a directory we need to
552 * delay returning it.
555 return ce_slash
? -2 - pos
: pos
;
557 continue; /* keep looking */
559 * ce_name sorts after p->path; could it be that we
560 * have files under p->path directory in the index?
561 * E.g. ce_name == "t-i", and p->path == "t"; we may
562 * have "t/a" in the index.
564 if (p_len
< ce_len
&& !memcmp(ce_name
, p
->path
, p_len
) &&
565 ce_name
[p_len
] < '/')
566 continue; /* keep looking */
572 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
573 const struct name_entry
*p
)
575 int pos
= find_cache_pos(info
, p
);
576 struct unpack_trees_options
*o
= info
->data
;
579 return o
->src_index
->cache
[pos
];
584 static void debug_path(struct traverse_info
*info
)
587 debug_path(info
->prev
);
588 if (*info
->prev
->name
.path
)
591 printf("%s", info
->name
.path
);
594 static void debug_name_entry(int i
, struct name_entry
*n
)
596 printf("ent#%d %06o %s\n", i
,
597 n
->path
? n
->mode
: 0,
598 n
->path
? n
->path
: "(missing)");
601 static void debug_unpack_callback(int n
,
603 unsigned long dirmask
,
604 struct name_entry
*names
,
605 struct traverse_info
*info
)
608 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
612 for (i
= 0; i
< n
; i
++)
613 debug_name_entry(i
, names
+ i
);
616 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
618 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
619 struct unpack_trees_options
*o
= info
->data
;
620 const struct name_entry
*p
= names
;
622 /* Find first entry with a real name (we could use "mask" too) */
627 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
629 /* Are we supposed to look at the index too? */
633 struct cache_entry
*ce
;
635 if (o
->diff_index_cached
)
636 ce
= next_cache_entry(o
);
638 ce
= find_cache_entry(info
, p
);
642 cmp
= compare_entry(ce
, info
, p
);
644 if (unpack_index_entry(ce
, o
) < 0)
645 return unpack_failed(o
, NULL
);
651 * If we skip unmerged index
652 * entries, we'll skip this
653 * entry *and* the tree
654 * entries associated with it!
656 if (o
->skip_unmerged
) {
657 add_same_unmerged(ce
, o
);
667 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
671 if (ce_stage(src
[0]))
672 mark_ce_used_same_name(src
[0], o
);
674 mark_ce_used(src
[0], o
);
677 /* Now handle any directories.. */
679 unsigned long conflicts
= mask
& ~dirmask
;
686 /* special case: "diff-index --cached" looking at a tree */
687 if (o
->diff_index_cached
&&
688 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
690 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
693 * Everything under the name matches; skip the
694 * entire hierarchy. diff_index_cached codepath
695 * special cases D/F conflicts in such a way that
696 * it does not do any look-ahead, so this is safe.
699 o
->cache_bottom
+= matches
;
704 if (traverse_trees_recursive(n
, dirmask
, conflicts
,
714 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
715 * resulting index, -2 on failure to reflect the changes to the work tree.
717 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
720 static struct cache_entry
*dfc
;
721 struct exclude_list el
;
723 if (len
> MAX_UNPACK_TREES
)
724 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
725 memset(&state
, 0, sizeof(state
));
729 state
.refresh_cache
= 1;
731 memset(&el
, 0, sizeof(el
));
732 if (!core_apply_sparse_checkout
|| !o
->update
)
733 o
->skip_sparse_checkout
= 1;
734 if (!o
->skip_sparse_checkout
) {
735 if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, NULL
, &el
, 0) < 0)
736 o
->skip_sparse_checkout
= 1;
741 memset(&o
->result
, 0, sizeof(o
->result
));
742 o
->result
.initialized
= 1;
743 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
744 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
746 mark_all_ce_unused(o
->src_index
);
749 dfc
= xcalloc(1, cache_entry_size(0));
750 o
->df_conflict_entry
= dfc
;
753 const char *prefix
= o
->prefix
? o
->prefix
: "";
754 struct traverse_info info
;
756 setup_traverse_info(&info
, prefix
);
757 info
.fn
= unpack_callback
;
762 * Unpack existing index entries that sort before the
763 * prefix the tree is spliced into. Note that o->merge
764 * is always true in this case.
767 struct cache_entry
*ce
= next_cache_entry(o
);
770 if (ce_in_traverse_path(ce
, &info
))
772 if (unpack_index_entry(ce
, o
) < 0)
777 if (traverse_trees(len
, t
, &info
) < 0)
781 /* Any left-over entries in the index? */
784 struct cache_entry
*ce
= next_cache_entry(o
);
787 if (unpack_index_entry(ce
, o
) < 0)
791 mark_all_ce_unused(o
->src_index
);
793 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
794 ret
= unpack_failed(o
, "Merge requires file-level merging");
798 if (!o
->skip_sparse_checkout
) {
799 int empty_worktree
= 1;
800 for (i
= 0;i
< o
->result
.cache_nr
;i
++) {
801 struct cache_entry
*ce
= o
->result
.cache
[i
];
803 if (apply_sparse_checkout(ce
, o
)) {
808 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
809 * area as a result of ce_skip_worktree() shortcuts in
810 * verify_absent() and verify_uptodate(). Clear them.
812 if (ce_skip_worktree(ce
))
813 ce
->ce_flags
&= ~(CE_UPDATE
| CE_REMOVE
);
818 if (o
->result
.cache_nr
&& empty_worktree
) {
819 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
825 ret
= check_updates(o
) ? (-2) : 0;
827 *o
->dst_index
= o
->result
;
830 for (i
= 0;i
< el
.nr
;i
++)
831 free(el
.excludes
[i
]);
838 mark_all_ce_unused(o
->src_index
);
839 ret
= unpack_failed(o
, NULL
);
843 /* Here come the merge functions */
845 static int reject_merge(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
847 return error(ERRORMSG(o
, would_overwrite
), ce
->name
);
850 static int same(struct cache_entry
*a
, struct cache_entry
*b
)
856 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
858 return a
->ce_mode
== b
->ce_mode
&&
859 !hashcmp(a
->sha1
, b
->sha1
);
864 * When a CE gets turned into an unmerged entry, we
865 * want it to be up-to-date
867 static int verify_uptodate_1(struct cache_entry
*ce
,
868 struct unpack_trees_options
*o
,
869 const char *error_msg
)
873 if (o
->index_only
|| (!ce_skip_worktree(ce
) && (o
->reset
|| ce_uptodate(ce
))))
876 if (!lstat(ce
->name
, &st
)) {
877 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
881 * NEEDSWORK: the current default policy is to allow
882 * submodule to be out of sync wrt the supermodule
883 * index. This needs to be tightened later for
884 * submodules that are marked to be automatically
887 if (S_ISGITLINK(ce
->ce_mode
))
893 return o
->gently
? -1 :
894 error(error_msg
, ce
->name
);
897 static int verify_uptodate(struct cache_entry
*ce
,
898 struct unpack_trees_options
*o
)
900 if (!o
->skip_sparse_checkout
&& will_have_skip_worktree(ce
, o
))
902 return verify_uptodate_1(ce
, o
, ERRORMSG(o
, not_uptodate_file
));
905 static int verify_uptodate_sparse(struct cache_entry
*ce
,
906 struct unpack_trees_options
*o
)
908 return verify_uptodate_1(ce
, o
, ERRORMSG(o
, sparse_not_uptodate_file
));
911 static void invalidate_ce_path(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
914 cache_tree_invalidate_path(o
->src_index
->cache_tree
, ce
->name
);
918 * Check that checking out ce->sha1 in subdir ce->name is not
919 * going to overwrite any working files.
921 * Currently, git does not checkout subprojects during a superproject
922 * checkout, so it is not going to overwrite anything.
924 static int verify_clean_submodule(struct cache_entry
*ce
, const char *action
,
925 struct unpack_trees_options
*o
)
930 static int verify_clean_subdirectory(struct cache_entry
*ce
, const char *action
,
931 struct unpack_trees_options
*o
)
934 * we are about to extract "ce->name"; we would not want to lose
935 * anything in the existing directory there.
942 unsigned char sha1
[20];
944 if (S_ISGITLINK(ce
->ce_mode
) &&
945 resolve_gitlink_ref(ce
->name
, "HEAD", sha1
) == 0) {
946 /* If we are not going to update the submodule, then
949 if (!hashcmp(sha1
, ce
->sha1
))
951 return verify_clean_submodule(ce
, action
, o
);
955 * First let's make sure we do not have a local modification
958 namelen
= strlen(ce
->name
);
959 for (i
= locate_in_src_index(ce
, o
);
960 i
< o
->src_index
->cache_nr
;
962 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
963 int len
= ce_namelen(ce2
);
965 strncmp(ce
->name
, ce2
->name
, namelen
) ||
966 ce2
->name
[namelen
] != '/')
969 * ce2->name is an entry in the subdirectory to be
972 if (!ce_stage(ce2
)) {
973 if (verify_uptodate(ce2
, o
))
975 add_entry(o
, ce2
, CE_REMOVE
, 0);
976 mark_ce_used(ce2
, o
);
982 * Then we need to make sure that we do not lose a locally
983 * present file that is not ignored.
985 pathbuf
= xmalloc(namelen
+ 2);
986 memcpy(pathbuf
, ce
->name
, namelen
);
987 strcpy(pathbuf
+namelen
, "/");
989 memset(&d
, 0, sizeof(d
));
991 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
992 i
= read_directory(&d
, pathbuf
, namelen
+1, NULL
);
994 return o
->gently
? -1 :
995 error(ERRORMSG(o
, not_uptodate_dir
), ce
->name
);
1001 * This gets called when there was no index entry for the tree entry 'dst',
1002 * but we found a file in the working tree that 'lstat()' said was fine,
1003 * and we're on a case-insensitive filesystem.
1005 * See if we can find a case-insensitive match in the index that also
1006 * matches the stat information, and assume it's that other file!
1008 static int icase_exists(struct unpack_trees_options
*o
, struct cache_entry
*dst
, struct stat
*st
)
1010 struct cache_entry
*src
;
1012 src
= index_name_exists(o
->src_index
, dst
->name
, ce_namelen(dst
), 1);
1013 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
1017 * We do not want to remove or overwrite a working tree file that
1018 * is not tracked, unless it is ignored.
1020 static int verify_absent_1(struct cache_entry
*ce
, const char *action
,
1021 struct unpack_trees_options
*o
,
1022 const char *error_msg
)
1026 if (o
->index_only
|| o
->reset
|| !o
->update
)
1029 if (has_symlink_or_noent_leading_path(ce
->name
, ce_namelen(ce
)))
1032 if (!lstat(ce
->name
, &st
)) {
1033 int dtype
= ce_to_dtype(ce
);
1034 struct cache_entry
*result
;
1037 * It may be that the 'lstat()' succeeded even though
1038 * target 'ce' was absent, because there is an old
1039 * entry that is different only in case..
1041 * Ignore that lstat() if it matches.
1043 if (ignore_case
&& icase_exists(o
, ce
, &st
))
1046 if (o
->dir
&& excluded(o
->dir
, ce
->name
, &dtype
))
1048 * ce->name is explicitly excluded, so it is Ok to
1052 if (S_ISDIR(st
.st_mode
)) {
1054 * We are checking out path "foo" and
1055 * found "foo/." in the working tree.
1056 * This is tricky -- if we have modified
1057 * files that are in "foo/" we would lose
1060 if (verify_clean_subdirectory(ce
, action
, o
) < 0)
1066 * The previous round may already have decided to
1067 * delete this path, which is in a subdirectory that
1068 * is being replaced with a blob.
1070 result
= index_name_exists(&o
->result
, ce
->name
, ce_namelen(ce
), 0);
1072 if (result
->ce_flags
& CE_REMOVE
)
1076 return o
->gently
? -1 :
1077 error(ERRORMSG(o
, would_lose_untracked
), ce
->name
, action
);
1081 static int verify_absent(struct cache_entry
*ce
, const char *action
,
1082 struct unpack_trees_options
*o
)
1084 if (!o
->skip_sparse_checkout
&& will_have_skip_worktree(ce
, o
))
1086 return verify_absent_1(ce
, action
, o
, ERRORMSG(o
, would_lose_untracked
));
1089 static int verify_absent_sparse(struct cache_entry
*ce
, const char *action
,
1090 struct unpack_trees_options
*o
)
1092 return verify_absent_1(ce
, action
, o
, ERRORMSG(o
, would_lose_orphaned
));
1095 static int merged_entry(struct cache_entry
*merge
, struct cache_entry
*old
,
1096 struct unpack_trees_options
*o
)
1098 int update
= CE_UPDATE
;
1101 if (verify_absent(merge
, "overwritten", o
))
1103 invalidate_ce_path(merge
, o
);
1104 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
1106 * See if we can re-use the old CE directly?
1107 * That way we get the uptodate stat info.
1109 * This also removes the UPDATE flag on a match; otherwise
1110 * we will end up overwriting local changes in the work tree.
1112 if (same(old
, merge
)) {
1113 copy_cache_entry(merge
, old
);
1116 if (verify_uptodate(old
, o
))
1118 if (ce_skip_worktree(old
))
1119 update
|= CE_SKIP_WORKTREE
;
1120 invalidate_ce_path(old
, o
);
1124 * Previously unmerged entry left as an existence
1125 * marker by read_index_unmerged();
1127 invalidate_ce_path(old
, o
);
1130 add_entry(o
, merge
, update
, CE_STAGEMASK
);
1134 static int deleted_entry(struct cache_entry
*ce
, struct cache_entry
*old
,
1135 struct unpack_trees_options
*o
)
1137 /* Did it exist in the index? */
1139 if (verify_absent(ce
, "removed", o
))
1143 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
1145 add_entry(o
, ce
, CE_REMOVE
, 0);
1146 invalidate_ce_path(ce
, o
);
1150 static int keep_entry(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
1152 add_entry(o
, ce
, 0, 0);
1157 static void show_stage_entry(FILE *o
,
1158 const char *label
, const struct cache_entry
*ce
)
1161 fprintf(o
, "%s (missing)\n", label
);
1163 fprintf(o
, "%s%06o %s %d\t%s\n",
1166 sha1_to_hex(ce
->sha1
),
1172 int threeway_merge(struct cache_entry
**stages
, struct unpack_trees_options
*o
)
1174 struct cache_entry
*index
;
1175 struct cache_entry
*head
;
1176 struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
1179 int remote_match
= 0;
1181 int df_conflict_head
= 0;
1182 int df_conflict_remote
= 0;
1184 int any_anc_missing
= 0;
1185 int no_anc_exists
= 1;
1188 for (i
= 1; i
< o
->head_idx
; i
++) {
1189 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
1190 any_anc_missing
= 1;
1196 head
= stages
[o
->head_idx
];
1198 if (head
== o
->df_conflict_entry
) {
1199 df_conflict_head
= 1;
1203 if (remote
== o
->df_conflict_entry
) {
1204 df_conflict_remote
= 1;
1209 * First, if there's a #16 situation, note that to prevent #13
1212 if (!same(remote
, head
)) {
1213 for (i
= 1; i
< o
->head_idx
; i
++) {
1214 if (same(stages
[i
], head
)) {
1217 if (same(stages
[i
], remote
)) {
1224 * We start with cases where the index is allowed to match
1225 * something other than the head: #14(ALT) and #2ALT, where it
1226 * is permitted to match the result instead.
1228 /* #14, #14ALT, #2ALT */
1229 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
1230 if (index
&& !same(index
, remote
) && !same(index
, head
))
1231 return o
->gently
? -1 : reject_merge(index
, o
);
1232 return merged_entry(remote
, index
, o
);
1235 * If we have an entry in the index cache, then we want to
1236 * make sure that it matches head.
1238 if (index
&& !same(index
, head
))
1239 return o
->gently
? -1 : reject_merge(index
, o
);
1243 if (same(head
, remote
))
1244 return merged_entry(head
, index
, o
);
1246 if (!df_conflict_remote
&& remote_match
&& !head_match
)
1247 return merged_entry(head
, index
, o
);
1251 if (!head
&& !remote
&& any_anc_missing
)
1255 * Under the "aggressive" rule, we resolve mostly trivial
1256 * cases that we historically had git-merge-one-file resolve.
1258 if (o
->aggressive
) {
1259 int head_deleted
= !head
;
1260 int remote_deleted
= !remote
;
1261 struct cache_entry
*ce
= NULL
;
1270 for (i
= 1; i
< o
->head_idx
; i
++) {
1271 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1280 * Deleted in one and unchanged in the other.
1282 if ((head_deleted
&& remote_deleted
) ||
1283 (head_deleted
&& remote
&& remote_match
) ||
1284 (remote_deleted
&& head
&& head_match
)) {
1286 return deleted_entry(index
, index
, o
);
1287 if (ce
&& !head_deleted
) {
1288 if (verify_absent(ce
, "removed", o
))
1294 * Added in both, identically.
1296 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
1297 return merged_entry(head
, index
, o
);
1301 /* Below are "no merge" cases, which require that the index be
1302 * up-to-date to avoid the files getting overwritten with
1303 * conflict resolution files.
1306 if (verify_uptodate(index
, o
))
1310 o
->nontrivial_merge
= 1;
1312 /* #2, #3, #4, #6, #7, #9, #10, #11. */
1314 if (!head_match
|| !remote_match
) {
1315 for (i
= 1; i
< o
->head_idx
; i
++) {
1316 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1317 keep_entry(stages
[i
], o
);
1325 fprintf(stderr
, "read-tree: warning #16 detected\n");
1326 show_stage_entry(stderr
, "head ", stages
[head_match
]);
1327 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
1330 if (head
) { count
+= keep_entry(head
, o
); }
1331 if (remote
) { count
+= keep_entry(remote
, o
); }
1338 * The rule is to "carry forward" what is in the index without losing
1339 * information across a "fast-forward", favoring a successful merge
1340 * over a merge failure when it makes sense. For details of the
1341 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
1344 int twoway_merge(struct cache_entry
**src
, struct unpack_trees_options
*o
)
1346 struct cache_entry
*current
= src
[0];
1347 struct cache_entry
*oldtree
= src
[1];
1348 struct cache_entry
*newtree
= src
[2];
1350 if (o
->merge_size
!= 2)
1351 return error("Cannot do a twoway merge of %d trees",
1354 if (oldtree
== o
->df_conflict_entry
)
1356 if (newtree
== o
->df_conflict_entry
)
1360 if ((!oldtree
&& !newtree
) || /* 4 and 5 */
1361 (!oldtree
&& newtree
&&
1362 same(current
, newtree
)) || /* 6 and 7 */
1363 (oldtree
&& newtree
&&
1364 same(oldtree
, newtree
)) || /* 14 and 15 */
1365 (oldtree
&& newtree
&&
1366 !same(oldtree
, newtree
) && /* 18 and 19 */
1367 same(current
, newtree
))) {
1368 return keep_entry(current
, o
);
1370 else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
1372 return deleted_entry(oldtree
, current
, o
);
1374 else if (oldtree
&& newtree
&&
1375 same(current
, oldtree
) && !same(current
, newtree
)) {
1377 return merged_entry(newtree
, current
, o
);
1380 /* all other failures */
1382 return o
->gently
? -1 : reject_merge(oldtree
, o
);
1384 return o
->gently
? -1 : reject_merge(current
, o
);
1386 return o
->gently
? -1 : reject_merge(newtree
, o
);
1391 if (oldtree
&& !o
->initial_checkout
) {
1393 * deletion of the path was staged;
1395 if (same(oldtree
, newtree
))
1397 return reject_merge(oldtree
, o
);
1399 return merged_entry(newtree
, current
, o
);
1401 return deleted_entry(oldtree
, current
, o
);
1407 * Keep the index entries at stage0, collapse stage1 but make sure
1408 * stage0 does not have anything there.
1410 int bind_merge(struct cache_entry
**src
,
1411 struct unpack_trees_options
*o
)
1413 struct cache_entry
*old
= src
[0];
1414 struct cache_entry
*a
= src
[1];
1416 if (o
->merge_size
!= 1)
1417 return error("Cannot do a bind merge of %d trees\n",
1420 return o
->gently
? -1 :
1421 error(ERRORMSG(o
, bind_overlap
), a
->name
, old
->name
);
1423 return keep_entry(old
, o
);
1425 return merged_entry(a
, NULL
, o
);
1432 * - take the stat information from stage0, take the data from stage1
1434 int oneway_merge(struct cache_entry
**src
, struct unpack_trees_options
*o
)
1436 struct cache_entry
*old
= src
[0];
1437 struct cache_entry
*a
= src
[1];
1439 if (o
->merge_size
!= 1)
1440 return error("Cannot do a oneway merge of %d trees",
1443 if (!a
|| a
== o
->df_conflict_entry
)
1444 return deleted_entry(old
, old
, o
);
1446 if (old
&& same(old
, a
)) {
1448 if (o
->reset
&& !ce_uptodate(old
) && !ce_skip_worktree(old
)) {
1450 if (lstat(old
->name
, &st
) ||
1451 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
1452 update
|= CE_UPDATE
;
1454 add_entry(o
, old
, update
, 0);
1457 return merged_entry(a
, old
, o
);