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" and "git merge" replaces
17 * them using setup_unpack_trees_porcelain(), for example.
19 static const char *unpack_plumbing_errors
[NB_UNPACK_TREES_ERROR_TYPES
] = {
20 /* ERROR_WOULD_OVERWRITE */
21 "Entry '%s' would be overwritten by merge. Cannot merge.",
23 /* ERROR_NOT_UPTODATE_FILE */
24 "Entry '%s' not uptodate. Cannot merge.",
26 /* ERROR_NOT_UPTODATE_DIR */
27 "Updating '%s' would lose untracked files in it",
29 /* ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN */
30 "Untracked working tree file '%s' would be overwritten by merge.",
32 /* ERROR_WOULD_LOSE_UNTRACKED_REMOVED */
33 "Untracked working tree file '%s' would be removed by merge.",
35 /* ERROR_BIND_OVERLAP */
36 "Entry '%s' overlaps with '%s'. Cannot bind.",
38 /* ERROR_SPARSE_NOT_UPTODATE_FILE */
39 "Entry '%s' not uptodate. Cannot update sparse checkout.",
41 /* ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN */
42 "Working tree file '%s' would be overwritten by sparse checkout update.",
44 /* ERROR_WOULD_LOSE_ORPHANED_REMOVED */
45 "Working tree file '%s' would be removed by sparse checkout update.",
48 #define ERRORMSG(o,type) \
49 ( ((o) && (o)->msgs[(type)]) \
50 ? ((o)->msgs[(type)]) \
51 : (unpack_plumbing_errors[(type)]) )
53 void setup_unpack_trees_porcelain(struct unpack_trees_options
*opts
,
57 const char **msgs
= opts
->msgs
;
60 const char *cmd2
= strcmp(cmd
, "checkout") ? cmd
: "switch branches";
61 if (advice_commit_before_merge
)
62 msg
= "Your local changes to the following files would be overwritten by %s:\n%%s"
63 "Please, commit your changes or stash them before you can %s.";
65 msg
= "Your local changes to the following files would be overwritten by %s:\n%%s";
66 tmp
= xmalloc(strlen(msg
) + strlen(cmd
) + strlen(cmd2
) - 2);
67 sprintf(tmp
, msg
, cmd
, cmd2
);
68 msgs
[ERROR_WOULD_OVERWRITE
] = tmp
;
69 msgs
[ERROR_NOT_UPTODATE_FILE
] = tmp
;
71 msgs
[ERROR_NOT_UPTODATE_DIR
] =
72 "Updating the following directories would lose untracked files in it:\n%s";
74 if (advice_commit_before_merge
)
75 msg
= "The following untracked working tree files would be %s by %s:\n%%s"
76 "Please move or remove them before you can %s.";
78 msg
= "The following untracked working tree files would be %s by %s:\n%%s";
79 tmp
= xmalloc(strlen(msg
) + strlen(cmd
) + strlen("removed") + strlen(cmd2
) - 4);
80 sprintf(tmp
, msg
, "removed", cmd
, cmd2
);
81 msgs
[ERROR_WOULD_LOSE_UNTRACKED_REMOVED
] = tmp
;
82 tmp
= xmalloc(strlen(msg
) + strlen(cmd
) + strlen("overwritten") + strlen(cmd2
) - 4);
83 sprintf(tmp
, msg
, "overwritten", cmd
, cmd2
);
84 msgs
[ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
] = tmp
;
87 * Special case: ERROR_BIND_OVERLAP refers to a pair of paths, we
88 * cannot easily display it as a list.
90 msgs
[ERROR_BIND_OVERLAP
] = "Entry '%s' overlaps with '%s'. Cannot bind.";
92 msgs
[ERROR_SPARSE_NOT_UPTODATE_FILE
] =
93 "Cannot update sparse checkout: the following entries are not up-to-date:\n%s";
94 msgs
[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
] =
95 "The following Working tree files would be overwritten by sparse checkout update:\n%s";
96 msgs
[ERROR_WOULD_LOSE_ORPHANED_REMOVED
] =
97 "The following Working tree files would be removed by sparse checkout update:\n%s";
99 opts
->show_all_errors
= 1;
100 /* rejected paths may not have a static buffer */
101 for (i
= 0; i
< ARRAY_SIZE(opts
->unpack_rejects
); i
++)
102 opts
->unpack_rejects
[i
].strdup_strings
= 1;
105 static void do_add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
106 unsigned int set
, unsigned int clear
)
113 ce
->ce_flags
= (ce
->ce_flags
& ~clear
) | set
;
114 add_index_entry(&o
->result
, ce
,
115 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
118 static struct cache_entry
*dup_entry(const struct cache_entry
*ce
)
120 unsigned int size
= ce_size(ce
);
121 struct cache_entry
*new = xmalloc(size
);
123 memcpy(new, ce
, size
);
127 static void add_entry(struct unpack_trees_options
*o
,
128 const struct cache_entry
*ce
,
129 unsigned int set
, unsigned int clear
)
131 do_add_entry(o
, dup_entry(ce
), set
, clear
);
135 * add error messages on path <path>
136 * corresponding to the type <e> with the message <msg>
137 * indicating if it should be display in porcelain or not
139 static int add_rejected_path(struct unpack_trees_options
*o
,
140 enum unpack_trees_error_types e
,
143 if (!o
->show_all_errors
)
144 return error(ERRORMSG(o
, e
), path
);
147 * Otherwise, insert in a list for future display by
148 * display_error_msgs()
150 string_list_append(&o
->unpack_rejects
[e
], path
);
155 * display all the error messages stored in a nice way
157 static void display_error_msgs(struct unpack_trees_options
*o
)
160 int something_displayed
= 0;
161 for (e
= 0; e
< NB_UNPACK_TREES_ERROR_TYPES
; e
++) {
162 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
163 if (rejects
->nr
> 0) {
164 struct strbuf path
= STRBUF_INIT
;
165 something_displayed
= 1;
166 for (i
= 0; i
< rejects
->nr
; i
++)
167 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
168 error(ERRORMSG(o
, e
), path
.buf
);
169 strbuf_release(&path
);
171 string_list_clear(rejects
, 0);
173 if (something_displayed
)
174 fprintf(stderr
, "Aborting\n");
178 * Unlink the last component and schedule the leading directories for
179 * removal, such that empty directories get removed.
181 static void unlink_entry(const struct cache_entry
*ce
)
183 if (!check_leading_path(ce
->name
, ce_namelen(ce
)))
185 if (remove_or_warn(ce
->ce_mode
, ce
->name
))
187 schedule_dir_for_removal(ce
->name
, ce_namelen(ce
));
190 static struct checkout state
;
191 static int check_updates(struct unpack_trees_options
*o
)
193 unsigned cnt
= 0, total
= 0;
194 struct progress
*progress
= NULL
;
195 struct index_state
*index
= &o
->result
;
199 if (o
->update
&& o
->verbose_update
) {
200 for (total
= cnt
= 0; cnt
< index
->cache_nr
; cnt
++) {
201 const struct cache_entry
*ce
= index
->cache
[cnt
];
202 if (ce
->ce_flags
& (CE_UPDATE
| CE_WT_REMOVE
))
206 progress
= start_progress_delay(_("Checking out files"),
212 git_attr_set_direction(GIT_ATTR_CHECKOUT
, &o
->result
);
213 for (i
= 0; i
< index
->cache_nr
; i
++) {
214 const struct cache_entry
*ce
= index
->cache
[i
];
216 if (ce
->ce_flags
& CE_WT_REMOVE
) {
217 display_progress(progress
, ++cnt
);
218 if (o
->update
&& !o
->dry_run
)
223 remove_marked_cache_entries(&o
->result
);
224 remove_scheduled_dirs();
226 for (i
= 0; i
< index
->cache_nr
; i
++) {
227 struct cache_entry
*ce
= index
->cache
[i
];
229 if (ce
->ce_flags
& CE_UPDATE
) {
230 display_progress(progress
, ++cnt
);
231 ce
->ce_flags
&= ~CE_UPDATE
;
232 if (o
->update
&& !o
->dry_run
) {
233 errs
|= checkout_entry(ce
, &state
, NULL
);
237 stop_progress(&progress
);
239 git_attr_set_direction(GIT_ATTR_CHECKIN
, NULL
);
243 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
244 struct unpack_trees_options
*o
);
245 static int verify_absent_sparse(const struct cache_entry
*ce
,
246 enum unpack_trees_error_types
,
247 struct unpack_trees_options
*o
);
249 static int apply_sparse_checkout(struct index_state
*istate
,
250 struct cache_entry
*ce
,
251 struct unpack_trees_options
*o
)
253 int was_skip_worktree
= ce_skip_worktree(ce
);
255 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
256 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
258 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
259 if (was_skip_worktree
!= ce_skip_worktree(ce
))
260 istate
->cache_changed
|= CE_ENTRY_CHANGED
;
263 * if (!was_skip_worktree && !ce_skip_worktree()) {
264 * This is perfectly normal. Move on;
269 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
270 * area as a result of ce_skip_worktree() shortcuts in
271 * verify_absent() and verify_uptodate().
272 * Make sure they don't modify worktree if they are already
273 * outside checkout area
275 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
276 ce
->ce_flags
&= ~CE_UPDATE
;
279 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
280 * on to get that file removed from both index and worktree.
281 * If that file is already outside worktree area, don't
284 if (ce
->ce_flags
& CE_REMOVE
)
285 ce
->ce_flags
&= ~CE_WT_REMOVE
;
288 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
290 * If CE_UPDATE is set, verify_uptodate() must be called already
291 * also stat info may have lost after merged_entry() so calling
292 * verify_uptodate() again may fail
294 if (!(ce
->ce_flags
& CE_UPDATE
) && verify_uptodate_sparse(ce
, o
))
296 ce
->ce_flags
|= CE_WT_REMOVE
;
298 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
299 if (verify_absent_sparse(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
))
301 ce
->ce_flags
|= CE_UPDATE
;
306 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
307 struct unpack_trees_options
*o
)
309 int ret
= o
->fn(src
, o
);
315 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
317 ce
->ce_flags
|= CE_UNPACKED
;
319 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
320 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
321 int bottom
= o
->cache_bottom
;
322 while (bottom
< o
->src_index
->cache_nr
&&
323 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
325 o
->cache_bottom
= bottom
;
329 static void mark_all_ce_unused(struct index_state
*index
)
332 for (i
= 0; i
< index
->cache_nr
; i
++)
333 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
336 static int locate_in_src_index(const struct cache_entry
*ce
,
337 struct unpack_trees_options
*o
)
339 struct index_state
*index
= o
->src_index
;
340 int len
= ce_namelen(ce
);
341 int pos
= index_name_pos(index
, ce
->name
, len
);
348 * We call unpack_index_entry() with an unmerged cache entry
349 * only in diff-index, and it wants a single callback. Skip
350 * the other unmerged entry with the same name.
352 static void mark_ce_used_same_name(struct cache_entry
*ce
,
353 struct unpack_trees_options
*o
)
355 struct index_state
*index
= o
->src_index
;
356 int len
= ce_namelen(ce
);
359 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
360 struct cache_entry
*next
= index
->cache
[pos
];
361 if (len
!= ce_namelen(next
) ||
362 memcmp(ce
->name
, next
->name
, len
))
364 mark_ce_used(next
, o
);
368 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
370 const struct index_state
*index
= o
->src_index
;
371 int pos
= o
->cache_bottom
;
373 while (pos
< index
->cache_nr
) {
374 struct cache_entry
*ce
= index
->cache
[pos
];
375 if (!(ce
->ce_flags
& CE_UNPACKED
))
382 static void add_same_unmerged(const struct cache_entry
*ce
,
383 struct unpack_trees_options
*o
)
385 struct index_state
*index
= o
->src_index
;
386 int len
= ce_namelen(ce
);
387 int pos
= index_name_pos(index
, ce
->name
, len
);
390 die("programming error in a caller of mark_ce_used_same_name");
391 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
392 struct cache_entry
*next
= index
->cache
[pos
];
393 if (len
!= ce_namelen(next
) ||
394 memcmp(ce
->name
, next
->name
, len
))
396 add_entry(o
, next
, 0, 0);
397 mark_ce_used(next
, o
);
401 static int unpack_index_entry(struct cache_entry
*ce
,
402 struct unpack_trees_options
*o
)
404 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
411 if (o
->skip_unmerged
) {
412 add_entry(o
, ce
, 0, 0);
416 ret
= call_unpack_fn(src
, o
);
418 mark_ce_used_same_name(ce
, o
);
422 static int find_cache_pos(struct traverse_info
*, const struct name_entry
*);
424 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
426 struct unpack_trees_options
*o
= info
->data
;
428 if (o
->diff_index_cached
)
430 o
->cache_bottom
= bottom
;
433 static int switch_cache_bottom(struct traverse_info
*info
)
435 struct unpack_trees_options
*o
= info
->data
;
438 if (o
->diff_index_cached
)
440 ret
= o
->cache_bottom
;
441 pos
= find_cache_pos(info
->prev
, &info
->name
);
444 o
->cache_bottom
= -2 - pos
;
446 o
->cache_bottom
= o
->src_index
->cache_nr
;
450 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
451 unsigned long df_conflicts
,
452 struct name_entry
*names
,
453 struct traverse_info
*info
)
456 struct tree_desc t
[MAX_UNPACK_TREES
];
457 void *buf
[MAX_UNPACK_TREES
];
458 struct traverse_info newinfo
;
459 struct name_entry
*p
;
467 newinfo
.pathspec
= info
->pathspec
;
469 newinfo
.pathlen
+= tree_entry_len(p
) + 1;
470 newinfo
.df_conflicts
|= df_conflicts
;
472 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
473 const unsigned char *sha1
= NULL
;
475 sha1
= names
[i
].sha1
;
476 buf
[i
] = fill_tree_descriptor(t
+i
, sha1
);
479 bottom
= switch_cache_bottom(&newinfo
);
480 ret
= traverse_trees(n
, t
, &newinfo
);
481 restore_cache_bottom(&newinfo
, bottom
);
483 for (i
= 0; i
< n
; i
++)
490 * Compare the traverse-path to the cache entry without actually
491 * having to generate the textual representation of the traverse
494 * NOTE! This *only* compares up to the size of the traverse path
495 * itself - the caller needs to do the final check for the cache
496 * entry having more data at the end!
498 static int do_compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
500 int len
, pathlen
, ce_len
;
504 int cmp
= do_compare_entry(ce
, info
->prev
, &info
->name
);
508 pathlen
= info
->pathlen
;
509 ce_len
= ce_namelen(ce
);
511 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
512 if (ce_len
< pathlen
)
516 ce_name
= ce
->name
+ pathlen
;
518 len
= tree_entry_len(n
);
519 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
522 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
524 int cmp
= do_compare_entry(ce
, info
, n
);
529 * Even if the beginning compared identically, the ce should
530 * compare as bigger than a directory leading up to it!
532 return ce_namelen(ce
) > traverse_path_len(info
, n
);
535 static int ce_in_traverse_path(const struct cache_entry
*ce
,
536 const struct traverse_info
*info
)
540 if (do_compare_entry(ce
, info
->prev
, &info
->name
))
543 * If ce (blob) is the same name as the path (which is a tree
544 * we will be descending into), it won't be inside it.
546 return (info
->pathlen
< ce_namelen(ce
));
549 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
, const struct name_entry
*n
, int stage
)
551 int len
= traverse_path_len(info
, n
);
552 struct cache_entry
*ce
= xcalloc(1, cache_entry_size(len
));
554 ce
->ce_mode
= create_ce_mode(n
->mode
);
555 ce
->ce_flags
= create_ce_flags(stage
);
556 ce
->ce_namelen
= len
;
557 hashcpy(ce
->sha1
, n
->sha1
);
558 make_traverse_path(ce
->name
, info
, n
);
563 static int unpack_nondirectories(int n
, unsigned long mask
,
564 unsigned long dirmask
,
565 struct cache_entry
**src
,
566 const struct name_entry
*names
,
567 const struct traverse_info
*info
)
570 struct unpack_trees_options
*o
= info
->data
;
571 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
573 /* Do we have *only* directories? Nothing to do */
574 if (mask
== dirmask
&& !src
[0])
578 * Ok, we've filled in up to any potential index entry in src[0],
581 for (i
= 0; i
< n
; i
++) {
583 unsigned int bit
= 1ul << i
;
584 if (conflicts
& bit
) {
585 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
592 else if (i
+ 1 < o
->head_idx
)
594 else if (i
+ 1 > o
->head_idx
)
598 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
);
602 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
604 for (i
= 0; i
< n
; i
++) {
605 struct cache_entry
*ce
= src
[i
+ o
->merge
];
606 if (ce
!= o
->df_conflict_entry
)
612 for (i
= 0; i
< n
; i
++)
613 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
614 do_add_entry(o
, src
[i
], 0, 0);
618 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
620 discard_index(&o
->result
);
621 if (!o
->gently
&& !o
->exiting_early
) {
623 return error("%s", message
);
629 /* NEEDSWORK: give this a better name and share with tree-walk.c */
630 static int name_compare(const char *a
, int a_len
,
631 const char *b
, int b_len
)
633 int len
= (a_len
< b_len
) ? a_len
: b_len
;
634 int cmp
= memcmp(a
, b
, len
);
637 return (a_len
- b_len
);
641 * The tree traversal is looking at name p. If we have a matching entry,
642 * return it. If name p is a directory in the index, do not return
643 * anything, as we will want to match it when the traversal descends into
646 static int find_cache_pos(struct traverse_info
*info
,
647 const struct name_entry
*p
)
650 struct unpack_trees_options
*o
= info
->data
;
651 struct index_state
*index
= o
->src_index
;
652 int pfxlen
= info
->pathlen
;
653 int p_len
= tree_entry_len(p
);
655 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
656 const struct cache_entry
*ce
= index
->cache
[pos
];
657 const char *ce_name
, *ce_slash
;
660 if (ce
->ce_flags
& CE_UNPACKED
) {
662 * cache_bottom entry is already unpacked, so
663 * we can never match it; don't check it
666 if (pos
== o
->cache_bottom
)
670 if (!ce_in_traverse_path(ce
, info
))
672 ce_name
= ce
->name
+ pfxlen
;
673 ce_slash
= strchr(ce_name
, '/');
675 ce_len
= ce_slash
- ce_name
;
677 ce_len
= ce_namelen(ce
) - pfxlen
;
678 cmp
= name_compare(p
->path
, p_len
, ce_name
, ce_len
);
680 * Exact match; if we have a directory we need to
681 * delay returning it.
684 return ce_slash
? -2 - pos
: pos
;
686 continue; /* keep looking */
688 * ce_name sorts after p->path; could it be that we
689 * have files under p->path directory in the index?
690 * E.g. ce_name == "t-i", and p->path == "t"; we may
691 * have "t/a" in the index.
693 if (p_len
< ce_len
&& !memcmp(ce_name
, p
->path
, p_len
) &&
694 ce_name
[p_len
] < '/')
695 continue; /* keep looking */
701 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
702 const struct name_entry
*p
)
704 int pos
= find_cache_pos(info
, p
);
705 struct unpack_trees_options
*o
= info
->data
;
708 return o
->src_index
->cache
[pos
];
713 static void debug_path(struct traverse_info
*info
)
716 debug_path(info
->prev
);
717 if (*info
->prev
->name
.path
)
720 printf("%s", info
->name
.path
);
723 static void debug_name_entry(int i
, struct name_entry
*n
)
725 printf("ent#%d %06o %s\n", i
,
726 n
->path
? n
->mode
: 0,
727 n
->path
? n
->path
: "(missing)");
730 static void debug_unpack_callback(int n
,
732 unsigned long dirmask
,
733 struct name_entry
*names
,
734 struct traverse_info
*info
)
737 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
741 for (i
= 0; i
< n
; i
++)
742 debug_name_entry(i
, names
+ i
);
745 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
747 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
748 struct unpack_trees_options
*o
= info
->data
;
749 const struct name_entry
*p
= names
;
751 /* Find first entry with a real name (we could use "mask" too) */
756 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
758 /* Are we supposed to look at the index too? */
762 struct cache_entry
*ce
;
764 if (o
->diff_index_cached
)
765 ce
= next_cache_entry(o
);
767 ce
= find_cache_entry(info
, p
);
771 cmp
= compare_entry(ce
, info
, p
);
773 if (unpack_index_entry(ce
, o
) < 0)
774 return unpack_failed(o
, NULL
);
780 * If we skip unmerged index
781 * entries, we'll skip this
782 * entry *and* the tree
783 * entries associated with it!
785 if (o
->skip_unmerged
) {
786 add_same_unmerged(ce
, o
);
796 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
799 if (o
->merge
&& src
[0]) {
800 if (ce_stage(src
[0]))
801 mark_ce_used_same_name(src
[0], o
);
803 mark_ce_used(src
[0], o
);
806 /* Now handle any directories.. */
808 /* special case: "diff-index --cached" looking at a tree */
809 if (o
->diff_index_cached
&&
810 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
812 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
815 * Everything under the name matches; skip the
816 * entire hierarchy. diff_index_cached codepath
817 * special cases D/F conflicts in such a way that
818 * it does not do any look-ahead, so this is safe.
821 o
->cache_bottom
+= matches
;
826 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
835 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
836 struct strbuf
*prefix
,
837 int select_mask
, int clear_mask
,
838 struct exclude_list
*el
, int defval
);
840 /* Whole directory matching */
841 static int clear_ce_flags_dir(struct cache_entry
**cache
, int nr
,
842 struct strbuf
*prefix
,
844 int select_mask
, int clear_mask
,
845 struct exclude_list
*el
, int defval
)
847 struct cache_entry
**cache_end
;
849 int ret
= is_excluded_from_list(prefix
->buf
, prefix
->len
,
850 basename
, &dtype
, el
);
853 strbuf_addch(prefix
, '/');
855 /* If undecided, use matching result of parent dir in defval */
859 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
860 struct cache_entry
*ce
= *cache_end
;
861 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
866 * TODO: check el, if there are no patterns that may conflict
867 * with ret (iow, we know in advance the incl/excl
868 * decision for the entire directory), clear flag here without
869 * calling clear_ce_flags_1(). That function will call
870 * the expensive is_excluded_from_list() on every entry.
872 rc
= clear_ce_flags_1(cache
, cache_end
- cache
,
874 select_mask
, clear_mask
,
876 strbuf_setlen(prefix
, prefix
->len
- 1);
881 * Traverse the index, find every entry that matches according to
882 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
883 * number of traversed entries.
885 * If select_mask is non-zero, only entries whose ce_flags has on of
886 * those bits enabled are traversed.
888 * cache : pointer to an index entry
889 * prefix_len : an offset to its path
891 * The current path ("prefix") including the trailing '/' is
892 * cache[0]->name[0..(prefix_len-1)]
893 * Top level path has prefix_len zero.
895 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
896 struct strbuf
*prefix
,
897 int select_mask
, int clear_mask
,
898 struct exclude_list
*el
, int defval
)
900 struct cache_entry
**cache_end
= cache
+ nr
;
903 * Process all entries that have the given prefix and meet
904 * select_mask condition
906 while(cache
!= cache_end
) {
907 struct cache_entry
*ce
= *cache
;
908 const char *name
, *slash
;
911 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
916 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
919 name
= ce
->name
+ prefix
->len
;
920 slash
= strchr(name
, '/');
922 /* If it's a directory, try whole directory match first */
927 strbuf_add(prefix
, name
, len
);
929 processed
= clear_ce_flags_dir(cache
, cache_end
- cache
,
931 prefix
->buf
+ prefix
->len
- len
,
932 select_mask
, clear_mask
,
935 /* clear_c_f_dir eats a whole dir already? */
938 strbuf_setlen(prefix
, prefix
->len
- len
);
942 strbuf_addch(prefix
, '/');
943 cache
+= clear_ce_flags_1(cache
, cache_end
- cache
,
945 select_mask
, clear_mask
, el
, defval
);
946 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
951 dtype
= ce_to_dtype(ce
);
952 ret
= is_excluded_from_list(ce
->name
, ce_namelen(ce
),
957 ce
->ce_flags
&= ~clear_mask
;
960 return nr
- (cache_end
- cache
);
963 static int clear_ce_flags(struct cache_entry
**cache
, int nr
,
964 int select_mask
, int clear_mask
,
965 struct exclude_list
*el
)
967 static struct strbuf prefix
= STRBUF_INIT
;
969 strbuf_reset(&prefix
);
971 return clear_ce_flags_1(cache
, nr
,
973 select_mask
, clear_mask
,
978 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
980 static void mark_new_skip_worktree(struct exclude_list
*el
,
981 struct index_state
*the_index
,
982 int select_flag
, int skip_wt_flag
)
987 * 1. Pretend the narrowest worktree: only unmerged entries
990 for (i
= 0; i
< the_index
->cache_nr
; i
++) {
991 struct cache_entry
*ce
= the_index
->cache
[i
];
993 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
997 ce
->ce_flags
|= skip_wt_flag
;
999 ce
->ce_flags
&= ~skip_wt_flag
;
1003 * 2. Widen worktree according to sparse-checkout file.
1004 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1006 clear_ce_flags(the_index
->cache
, the_index
->cache_nr
,
1007 select_flag
, skip_wt_flag
, el
);
1010 static int verify_absent(const struct cache_entry
*,
1011 enum unpack_trees_error_types
,
1012 struct unpack_trees_options
*);
1014 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1015 * resulting index, -2 on failure to reflect the changes to the work tree.
1017 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1019 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1022 static struct cache_entry
*dfc
;
1023 struct exclude_list el
;
1025 if (len
> MAX_UNPACK_TREES
)
1026 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1027 memset(&state
, 0, sizeof(state
));
1028 state
.base_dir
= "";
1031 state
.refresh_cache
= 1;
1032 state
.istate
= &o
->result
;
1034 memset(&el
, 0, sizeof(el
));
1035 if (!core_apply_sparse_checkout
|| !o
->update
)
1036 o
->skip_sparse_checkout
= 1;
1037 if (!o
->skip_sparse_checkout
) {
1038 if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, &el
, 0) < 0)
1039 o
->skip_sparse_checkout
= 1;
1044 memset(&o
->result
, 0, sizeof(o
->result
));
1045 o
->result
.initialized
= 1;
1046 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1047 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1048 o
->result
.version
= o
->src_index
->version
;
1049 o
->merge_size
= len
;
1050 mark_all_ce_unused(o
->src_index
);
1053 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1055 if (!o
->skip_sparse_checkout
)
1056 mark_new_skip_worktree(o
->el
, o
->src_index
, 0, CE_NEW_SKIP_WORKTREE
);
1059 dfc
= xcalloc(1, cache_entry_size(0));
1060 o
->df_conflict_entry
= dfc
;
1063 const char *prefix
= o
->prefix
? o
->prefix
: "";
1064 struct traverse_info info
;
1066 setup_traverse_info(&info
, prefix
);
1067 info
.fn
= unpack_callback
;
1069 info
.show_all_errors
= o
->show_all_errors
;
1070 info
.pathspec
= o
->pathspec
;
1074 * Unpack existing index entries that sort before the
1075 * prefix the tree is spliced into. Note that o->merge
1076 * is always true in this case.
1079 struct cache_entry
*ce
= next_cache_entry(o
);
1082 if (ce_in_traverse_path(ce
, &info
))
1084 if (unpack_index_entry(ce
, o
) < 0)
1089 if (traverse_trees(len
, t
, &info
) < 0)
1093 /* Any left-over entries in the index? */
1096 struct cache_entry
*ce
= next_cache_entry(o
);
1099 if (unpack_index_entry(ce
, o
) < 0)
1103 mark_all_ce_unused(o
->src_index
);
1105 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1106 ret
= unpack_failed(o
, "Merge requires file-level merging");
1110 if (!o
->skip_sparse_checkout
) {
1111 int empty_worktree
= 1;
1114 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1115 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1116 * so apply_sparse_checkout() won't attempt to remove it from worktree
1118 mark_new_skip_worktree(o
->el
, &o
->result
, CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1121 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1122 struct cache_entry
*ce
= o
->result
.cache
[i
];
1125 * Entries marked with CE_ADDED in merged_entry() do not have
1126 * verify_absent() check (the check is effectively disabled
1127 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1129 * Do the real check now because we have had
1130 * correct CE_NEW_SKIP_WORKTREE
1132 if (ce
->ce_flags
& CE_ADDED
&&
1133 verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1134 if (!o
->show_all_errors
)
1139 if (apply_sparse_checkout(&o
->result
, ce
, o
)) {
1140 if (!o
->show_all_errors
)
1144 if (!ce_skip_worktree(ce
))
1151 * Sparse checkout is meant to narrow down checkout area
1152 * but it does not make sense to narrow down to empty working
1153 * tree. This is usually a mistake in sparse checkout rules.
1154 * Do not allow users to do that.
1156 if (o
->result
.cache_nr
&& empty_worktree
) {
1157 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1162 o
->src_index
= NULL
;
1163 ret
= check_updates(o
) ? (-2) : 0;
1165 discard_index(o
->dst_index
);
1166 *o
->dst_index
= o
->result
;
1170 clear_exclude_list(&el
);
1174 if (o
->show_all_errors
)
1175 display_error_msgs(o
);
1176 mark_all_ce_unused(o
->src_index
);
1177 ret
= unpack_failed(o
, NULL
);
1178 if (o
->exiting_early
)
1183 /* Here come the merge functions */
1185 static int reject_merge(const struct cache_entry
*ce
,
1186 struct unpack_trees_options
*o
)
1188 return add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1191 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1197 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1199 return a
->ce_mode
== b
->ce_mode
&&
1200 !hashcmp(a
->sha1
, b
->sha1
);
1205 * When a CE gets turned into an unmerged entry, we
1206 * want it to be up-to-date
1208 static int verify_uptodate_1(const struct cache_entry
*ce
,
1209 struct unpack_trees_options
*o
,
1210 enum unpack_trees_error_types error_type
)
1218 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1219 * if this entry is truly up-to-date because this file may be
1222 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1223 ; /* keep checking */
1224 else if (o
->reset
|| ce_uptodate(ce
))
1227 if (!lstat(ce
->name
, &st
)) {
1228 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1229 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1233 * NEEDSWORK: the current default policy is to allow
1234 * submodule to be out of sync wrt the superproject
1235 * index. This needs to be tightened later for
1236 * submodules that are marked to be automatically
1239 if (S_ISGITLINK(ce
->ce_mode
))
1243 if (errno
== ENOENT
)
1245 return o
->gently
? -1 :
1246 add_rejected_path(o
, error_type
, ce
->name
);
1249 static int verify_uptodate(const struct cache_entry
*ce
,
1250 struct unpack_trees_options
*o
)
1252 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1254 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1257 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1258 struct unpack_trees_options
*o
)
1260 return verify_uptodate_1(ce
, o
, ERROR_SPARSE_NOT_UPTODATE_FILE
);
1263 static void invalidate_ce_path(const struct cache_entry
*ce
,
1264 struct unpack_trees_options
*o
)
1267 cache_tree_invalidate_path(o
->src_index
, ce
->name
);
1271 * Check that checking out ce->sha1 in subdir ce->name is not
1272 * going to overwrite any working files.
1274 * Currently, git does not checkout subprojects during a superproject
1275 * checkout, so it is not going to overwrite anything.
1277 static int verify_clean_submodule(const struct cache_entry
*ce
,
1278 enum unpack_trees_error_types error_type
,
1279 struct unpack_trees_options
*o
)
1284 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1285 enum unpack_trees_error_types error_type
,
1286 struct unpack_trees_options
*o
)
1289 * we are about to extract "ce->name"; we would not want to lose
1290 * anything in the existing directory there.
1294 struct dir_struct d
;
1297 unsigned char sha1
[20];
1299 if (S_ISGITLINK(ce
->ce_mode
) &&
1300 resolve_gitlink_ref(ce
->name
, "HEAD", sha1
) == 0) {
1301 /* If we are not going to update the submodule, then
1304 if (!hashcmp(sha1
, ce
->sha1
))
1306 return verify_clean_submodule(ce
, error_type
, o
);
1310 * First let's make sure we do not have a local modification
1311 * in that directory.
1313 namelen
= ce_namelen(ce
);
1314 for (i
= locate_in_src_index(ce
, o
);
1315 i
< o
->src_index
->cache_nr
;
1317 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1318 int len
= ce_namelen(ce2
);
1319 if (len
< namelen
||
1320 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1321 ce2
->name
[namelen
] != '/')
1324 * ce2->name is an entry in the subdirectory to be
1327 if (!ce_stage(ce2
)) {
1328 if (verify_uptodate(ce2
, o
))
1330 add_entry(o
, ce2
, CE_REMOVE
, 0);
1331 mark_ce_used(ce2
, o
);
1337 * Then we need to make sure that we do not lose a locally
1338 * present file that is not ignored.
1340 pathbuf
= xmalloc(namelen
+ 2);
1341 memcpy(pathbuf
, ce
->name
, namelen
);
1342 strcpy(pathbuf
+namelen
, "/");
1344 memset(&d
, 0, sizeof(d
));
1346 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
1347 i
= read_directory(&d
, pathbuf
, namelen
+1, NULL
);
1349 return o
->gently
? -1 :
1350 add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
1356 * This gets called when there was no index entry for the tree entry 'dst',
1357 * but we found a file in the working tree that 'lstat()' said was fine,
1358 * and we're on a case-insensitive filesystem.
1360 * See if we can find a case-insensitive match in the index that also
1361 * matches the stat information, and assume it's that other file!
1363 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
1365 const struct cache_entry
*src
;
1367 src
= index_file_exists(o
->src_index
, name
, len
, 1);
1368 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
1371 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
1372 const struct cache_entry
*ce
, struct stat
*st
,
1373 enum unpack_trees_error_types error_type
,
1374 struct unpack_trees_options
*o
)
1376 const struct cache_entry
*result
;
1379 * It may be that the 'lstat()' succeeded even though
1380 * target 'ce' was absent, because there is an old
1381 * entry that is different only in case..
1383 * Ignore that lstat() if it matches.
1385 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
1389 is_excluded(o
->dir
, name
, &dtype
))
1391 * ce->name is explicitly excluded, so it is Ok to
1395 if (S_ISDIR(st
->st_mode
)) {
1397 * We are checking out path "foo" and
1398 * found "foo/." in the working tree.
1399 * This is tricky -- if we have modified
1400 * files that are in "foo/" we would lose
1403 if (verify_clean_subdirectory(ce
, error_type
, o
) < 0)
1409 * The previous round may already have decided to
1410 * delete this path, which is in a subdirectory that
1411 * is being replaced with a blob.
1413 result
= index_file_exists(&o
->result
, name
, len
, 0);
1415 if (result
->ce_flags
& CE_REMOVE
)
1419 return o
->gently
? -1 :
1420 add_rejected_path(o
, error_type
, name
);
1424 * We do not want to remove or overwrite a working tree file that
1425 * is not tracked, unless it is ignored.
1427 static int verify_absent_1(const struct cache_entry
*ce
,
1428 enum unpack_trees_error_types error_type
,
1429 struct unpack_trees_options
*o
)
1434 if (o
->index_only
|| o
->reset
|| !o
->update
)
1437 len
= check_leading_path(ce
->name
, ce_namelen(ce
));
1441 char path
[PATH_MAX
+ 1];
1442 memcpy(path
, ce
->name
, len
);
1444 if (lstat(path
, &st
))
1445 return error("cannot stat '%s': %s", path
,
1448 return check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
, &st
,
1450 } else if (lstat(ce
->name
, &st
)) {
1451 if (errno
!= ENOENT
)
1452 return error("cannot stat '%s': %s", ce
->name
,
1456 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
1457 ce_to_dtype(ce
), ce
, &st
,
1462 static int verify_absent(const struct cache_entry
*ce
,
1463 enum unpack_trees_error_types error_type
,
1464 struct unpack_trees_options
*o
)
1466 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1468 return verify_absent_1(ce
, error_type
, o
);
1471 static int verify_absent_sparse(const struct cache_entry
*ce
,
1472 enum unpack_trees_error_types error_type
,
1473 struct unpack_trees_options
*o
)
1475 enum unpack_trees_error_types orphaned_error
= error_type
;
1476 if (orphaned_error
== ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
)
1477 orphaned_error
= ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
;
1479 return verify_absent_1(ce
, orphaned_error
, o
);
1482 static int merged_entry(const struct cache_entry
*ce
,
1483 const struct cache_entry
*old
,
1484 struct unpack_trees_options
*o
)
1486 int update
= CE_UPDATE
;
1487 struct cache_entry
*merge
= dup_entry(ce
);
1491 * New index entries. In sparse checkout, the following
1492 * verify_absent() will be delayed until after
1493 * traverse_trees() finishes in unpack_trees(), then:
1495 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1496 * - verify_absent() be called again, this time with
1497 * correct CE_NEW_SKIP_WORKTREE
1499 * verify_absent() call here does nothing in sparse
1500 * checkout (i.e. o->skip_sparse_checkout == 0)
1503 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
1505 if (verify_absent(merge
,
1506 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1510 invalidate_ce_path(merge
, o
);
1511 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
1513 * See if we can re-use the old CE directly?
1514 * That way we get the uptodate stat info.
1516 * This also removes the UPDATE flag on a match; otherwise
1517 * we will end up overwriting local changes in the work tree.
1519 if (same(old
, merge
)) {
1520 copy_cache_entry(merge
, old
);
1523 if (verify_uptodate(old
, o
)) {
1527 /* Migrate old flags over */
1528 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1529 invalidate_ce_path(old
, o
);
1533 * Previously unmerged entry left as an existence
1534 * marker by read_index_unmerged();
1536 invalidate_ce_path(old
, o
);
1539 do_add_entry(o
, merge
, update
, CE_STAGEMASK
);
1543 static int deleted_entry(const struct cache_entry
*ce
,
1544 const struct cache_entry
*old
,
1545 struct unpack_trees_options
*o
)
1547 /* Did it exist in the index? */
1549 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1553 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
1555 add_entry(o
, ce
, CE_REMOVE
, 0);
1556 invalidate_ce_path(ce
, o
);
1560 static int keep_entry(const struct cache_entry
*ce
,
1561 struct unpack_trees_options
*o
)
1563 add_entry(o
, ce
, 0, 0);
1568 static void show_stage_entry(FILE *o
,
1569 const char *label
, const struct cache_entry
*ce
)
1572 fprintf(o
, "%s (missing)\n", label
);
1574 fprintf(o
, "%s%06o %s %d\t%s\n",
1577 sha1_to_hex(ce
->sha1
),
1583 int threeway_merge(const struct cache_entry
* const *stages
,
1584 struct unpack_trees_options
*o
)
1586 const struct cache_entry
*index
;
1587 const struct cache_entry
*head
;
1588 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
1591 int remote_match
= 0;
1593 int df_conflict_head
= 0;
1594 int df_conflict_remote
= 0;
1596 int any_anc_missing
= 0;
1597 int no_anc_exists
= 1;
1600 for (i
= 1; i
< o
->head_idx
; i
++) {
1601 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
1602 any_anc_missing
= 1;
1608 head
= stages
[o
->head_idx
];
1610 if (head
== o
->df_conflict_entry
) {
1611 df_conflict_head
= 1;
1615 if (remote
== o
->df_conflict_entry
) {
1616 df_conflict_remote
= 1;
1621 * First, if there's a #16 situation, note that to prevent #13
1624 if (!same(remote
, head
)) {
1625 for (i
= 1; i
< o
->head_idx
; i
++) {
1626 if (same(stages
[i
], head
)) {
1629 if (same(stages
[i
], remote
)) {
1636 * We start with cases where the index is allowed to match
1637 * something other than the head: #14(ALT) and #2ALT, where it
1638 * is permitted to match the result instead.
1640 /* #14, #14ALT, #2ALT */
1641 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
1642 if (index
&& !same(index
, remote
) && !same(index
, head
))
1643 return o
->gently
? -1 : reject_merge(index
, o
);
1644 return merged_entry(remote
, index
, o
);
1647 * If we have an entry in the index cache, then we want to
1648 * make sure that it matches head.
1650 if (index
&& !same(index
, head
))
1651 return o
->gently
? -1 : reject_merge(index
, o
);
1655 if (same(head
, remote
))
1656 return merged_entry(head
, index
, o
);
1658 if (!df_conflict_remote
&& remote_match
&& !head_match
)
1659 return merged_entry(head
, index
, o
);
1663 if (!head
&& !remote
&& any_anc_missing
)
1667 * Under the "aggressive" rule, we resolve mostly trivial
1668 * cases that we historically had git-merge-one-file resolve.
1670 if (o
->aggressive
) {
1671 int head_deleted
= !head
;
1672 int remote_deleted
= !remote
;
1673 const struct cache_entry
*ce
= NULL
;
1682 for (i
= 1; i
< o
->head_idx
; i
++) {
1683 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1692 * Deleted in one and unchanged in the other.
1694 if ((head_deleted
&& remote_deleted
) ||
1695 (head_deleted
&& remote
&& remote_match
) ||
1696 (remote_deleted
&& head
&& head_match
)) {
1698 return deleted_entry(index
, index
, o
);
1699 if (ce
&& !head_deleted
) {
1700 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1706 * Added in both, identically.
1708 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
1709 return merged_entry(head
, index
, o
);
1713 /* Below are "no merge" cases, which require that the index be
1714 * up-to-date to avoid the files getting overwritten with
1715 * conflict resolution files.
1718 if (verify_uptodate(index
, o
))
1722 o
->nontrivial_merge
= 1;
1724 /* #2, #3, #4, #6, #7, #9, #10, #11. */
1726 if (!head_match
|| !remote_match
) {
1727 for (i
= 1; i
< o
->head_idx
; i
++) {
1728 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1729 keep_entry(stages
[i
], o
);
1737 fprintf(stderr
, "read-tree: warning #16 detected\n");
1738 show_stage_entry(stderr
, "head ", stages
[head_match
]);
1739 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
1742 if (head
) { count
+= keep_entry(head
, o
); }
1743 if (remote
) { count
+= keep_entry(remote
, o
); }
1750 * The rule is to "carry forward" what is in the index without losing
1751 * information across a "fast-forward", favoring a successful merge
1752 * over a merge failure when it makes sense. For details of the
1753 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
1756 int twoway_merge(const struct cache_entry
* const *src
,
1757 struct unpack_trees_options
*o
)
1759 const struct cache_entry
*current
= src
[0];
1760 const struct cache_entry
*oldtree
= src
[1];
1761 const struct cache_entry
*newtree
= src
[2];
1763 if (o
->merge_size
!= 2)
1764 return error("Cannot do a twoway merge of %d trees",
1767 if (oldtree
== o
->df_conflict_entry
)
1769 if (newtree
== o
->df_conflict_entry
)
1773 if (current
->ce_flags
& CE_CONFLICTED
) {
1774 if (same(oldtree
, newtree
) || o
->reset
) {
1776 return deleted_entry(current
, current
, o
);
1778 return merged_entry(newtree
, current
, o
);
1780 return o
->gently
? -1 : reject_merge(current
, o
);
1782 else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
1783 (!oldtree
&& newtree
&&
1784 same(current
, newtree
)) || /* 6 and 7 */
1785 (oldtree
&& newtree
&&
1786 same(oldtree
, newtree
)) || /* 14 and 15 */
1787 (oldtree
&& newtree
&&
1788 !same(oldtree
, newtree
) && /* 18 and 19 */
1789 same(current
, newtree
))) {
1790 return keep_entry(current
, o
);
1792 else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
1794 return deleted_entry(oldtree
, current
, o
);
1796 else if (oldtree
&& newtree
&&
1797 same(current
, oldtree
) && !same(current
, newtree
)) {
1799 return merged_entry(newtree
, current
, o
);
1802 /* all other failures */
1804 return o
->gently
? -1 : reject_merge(oldtree
, o
);
1806 return o
->gently
? -1 : reject_merge(current
, o
);
1808 return o
->gently
? -1 : reject_merge(newtree
, o
);
1813 if (oldtree
&& !o
->initial_checkout
) {
1815 * deletion of the path was staged;
1817 if (same(oldtree
, newtree
))
1819 return reject_merge(oldtree
, o
);
1821 return merged_entry(newtree
, current
, o
);
1823 return deleted_entry(oldtree
, current
, o
);
1829 * Keep the index entries at stage0, collapse stage1 but make sure
1830 * stage0 does not have anything there.
1832 int bind_merge(const struct cache_entry
* const *src
,
1833 struct unpack_trees_options
*o
)
1835 const struct cache_entry
*old
= src
[0];
1836 const struct cache_entry
*a
= src
[1];
1838 if (o
->merge_size
!= 1)
1839 return error("Cannot do a bind merge of %d trees",
1842 return o
->gently
? -1 :
1843 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
), a
->name
, old
->name
);
1845 return keep_entry(old
, o
);
1847 return merged_entry(a
, NULL
, o
);
1854 * - take the stat information from stage0, take the data from stage1
1856 int oneway_merge(const struct cache_entry
* const *src
,
1857 struct unpack_trees_options
*o
)
1859 const struct cache_entry
*old
= src
[0];
1860 const struct cache_entry
*a
= src
[1];
1862 if (o
->merge_size
!= 1)
1863 return error("Cannot do a oneway merge of %d trees",
1866 if (!a
|| a
== o
->df_conflict_entry
)
1867 return deleted_entry(old
, old
, o
);
1869 if (old
&& same(old
, a
)) {
1871 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
)) {
1873 if (lstat(old
->name
, &st
) ||
1874 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
1875 update
|= CE_UPDATE
;
1877 add_entry(o
, old
, update
, 0);
1880 return merged_entry(a
, old
, o
);