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 int do_add_entry(struct unpack_trees_options
*o
, struct cache_entry
*ce
,
106 unsigned int set
, unsigned int clear
)
108 clear
|= CE_HASHED
| CE_UNHASHED
;
114 ce
->ce_flags
= (ce
->ce_flags
& ~clear
) | set
;
115 return add_index_entry(&o
->result
, ce
,
116 ADD_CACHE_OK_TO_ADD
| ADD_CACHE_OK_TO_REPLACE
);
119 static struct cache_entry
*dup_entry(const struct cache_entry
*ce
)
121 unsigned int size
= ce_size(ce
);
122 struct cache_entry
*new = xmalloc(size
);
124 memcpy(new, ce
, size
);
128 static void add_entry(struct unpack_trees_options
*o
,
129 const struct cache_entry
*ce
,
130 unsigned int set
, unsigned int clear
)
132 do_add_entry(o
, dup_entry(ce
), set
, clear
);
136 * add error messages on path <path>
137 * corresponding to the type <e> with the message <msg>
138 * indicating if it should be display in porcelain or not
140 static int add_rejected_path(struct unpack_trees_options
*o
,
141 enum unpack_trees_error_types e
,
144 if (!o
->show_all_errors
)
145 return error(ERRORMSG(o
, e
), path
);
148 * Otherwise, insert in a list for future display by
149 * display_error_msgs()
151 string_list_append(&o
->unpack_rejects
[e
], path
);
156 * display all the error messages stored in a nice way
158 static void display_error_msgs(struct unpack_trees_options
*o
)
161 int something_displayed
= 0;
162 for (e
= 0; e
< NB_UNPACK_TREES_ERROR_TYPES
; e
++) {
163 struct string_list
*rejects
= &o
->unpack_rejects
[e
];
164 if (rejects
->nr
> 0) {
165 struct strbuf path
= STRBUF_INIT
;
166 something_displayed
= 1;
167 for (i
= 0; i
< rejects
->nr
; i
++)
168 strbuf_addf(&path
, "\t%s\n", rejects
->items
[i
].string
);
169 error(ERRORMSG(o
, e
), path
.buf
);
170 strbuf_release(&path
);
172 string_list_clear(rejects
, 0);
174 if (something_displayed
)
175 fprintf(stderr
, "Aborting\n");
179 * Unlink the last component and schedule the leading directories for
180 * removal, such that empty directories get removed.
182 static void unlink_entry(const struct cache_entry
*ce
)
184 if (!check_leading_path(ce
->name
, ce_namelen(ce
)))
186 if (remove_or_warn(ce
->ce_mode
, ce
->name
))
188 schedule_dir_for_removal(ce
->name
, ce_namelen(ce
));
191 static struct checkout state
;
192 static int check_updates(struct unpack_trees_options
*o
)
194 unsigned cnt
= 0, total
= 0;
195 struct progress
*progress
= NULL
;
196 struct index_state
*index
= &o
->result
;
200 if (o
->update
&& o
->verbose_update
) {
201 for (total
= cnt
= 0; cnt
< index
->cache_nr
; cnt
++) {
202 const struct cache_entry
*ce
= index
->cache
[cnt
];
203 if (ce
->ce_flags
& (CE_UPDATE
| CE_WT_REMOVE
))
207 progress
= start_progress_delay("Checking out files",
213 git_attr_set_direction(GIT_ATTR_CHECKOUT
, &o
->result
);
214 for (i
= 0; i
< index
->cache_nr
; i
++) {
215 const struct cache_entry
*ce
= index
->cache
[i
];
217 if (ce
->ce_flags
& CE_WT_REMOVE
) {
218 display_progress(progress
, ++cnt
);
219 if (o
->update
&& !o
->dry_run
)
224 remove_marked_cache_entries(&o
->result
);
225 remove_scheduled_dirs();
227 for (i
= 0; i
< index
->cache_nr
; i
++) {
228 struct cache_entry
*ce
= index
->cache
[i
];
230 if (ce
->ce_flags
& CE_UPDATE
) {
231 display_progress(progress
, ++cnt
);
232 ce
->ce_flags
&= ~CE_UPDATE
;
233 if (o
->update
&& !o
->dry_run
) {
234 errs
|= checkout_entry(ce
, &state
, NULL
);
238 stop_progress(&progress
);
240 git_attr_set_direction(GIT_ATTR_CHECKIN
, NULL
);
244 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
245 struct unpack_trees_options
*o
);
246 static int verify_absent_sparse(const struct cache_entry
*ce
,
247 enum unpack_trees_error_types
,
248 struct unpack_trees_options
*o
);
250 static int apply_sparse_checkout(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
252 int was_skip_worktree
= ce_skip_worktree(ce
);
254 if (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
)
255 ce
->ce_flags
|= CE_SKIP_WORKTREE
;
257 ce
->ce_flags
&= ~CE_SKIP_WORKTREE
;
260 * if (!was_skip_worktree && !ce_skip_worktree()) {
261 * This is perfectly normal. Move on;
266 * Merge strategies may set CE_UPDATE|CE_REMOVE outside checkout
267 * area as a result of ce_skip_worktree() shortcuts in
268 * verify_absent() and verify_uptodate().
269 * Make sure they don't modify worktree if they are already
270 * outside checkout area
272 if (was_skip_worktree
&& ce_skip_worktree(ce
)) {
273 ce
->ce_flags
&= ~CE_UPDATE
;
276 * By default, when CE_REMOVE is on, CE_WT_REMOVE is also
277 * on to get that file removed from both index and worktree.
278 * If that file is already outside worktree area, don't
281 if (ce
->ce_flags
& CE_REMOVE
)
282 ce
->ce_flags
&= ~CE_WT_REMOVE
;
285 if (!was_skip_worktree
&& ce_skip_worktree(ce
)) {
287 * If CE_UPDATE is set, verify_uptodate() must be called already
288 * also stat info may have lost after merged_entry() so calling
289 * verify_uptodate() again may fail
291 if (!(ce
->ce_flags
& CE_UPDATE
) && verify_uptodate_sparse(ce
, o
))
293 ce
->ce_flags
|= CE_WT_REMOVE
;
295 if (was_skip_worktree
&& !ce_skip_worktree(ce
)) {
296 if (verify_absent_sparse(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
))
298 ce
->ce_flags
|= CE_UPDATE
;
303 static inline int call_unpack_fn(const struct cache_entry
* const *src
,
304 struct unpack_trees_options
*o
)
306 int ret
= o
->fn(src
, o
);
312 static void mark_ce_used(struct cache_entry
*ce
, struct unpack_trees_options
*o
)
314 ce
->ce_flags
|= CE_UNPACKED
;
316 if (o
->cache_bottom
< o
->src_index
->cache_nr
&&
317 o
->src_index
->cache
[o
->cache_bottom
] == ce
) {
318 int bottom
= o
->cache_bottom
;
319 while (bottom
< o
->src_index
->cache_nr
&&
320 o
->src_index
->cache
[bottom
]->ce_flags
& CE_UNPACKED
)
322 o
->cache_bottom
= bottom
;
326 static void mark_all_ce_unused(struct index_state
*index
)
329 for (i
= 0; i
< index
->cache_nr
; i
++)
330 index
->cache
[i
]->ce_flags
&= ~(CE_UNPACKED
| CE_ADDED
| CE_NEW_SKIP_WORKTREE
);
333 static int locate_in_src_index(const struct cache_entry
*ce
,
334 struct unpack_trees_options
*o
)
336 struct index_state
*index
= o
->src_index
;
337 int len
= ce_namelen(ce
);
338 int pos
= index_name_pos(index
, ce
->name
, len
);
345 * We call unpack_index_entry() with an unmerged cache entry
346 * only in diff-index, and it wants a single callback. Skip
347 * the other unmerged entry with the same name.
349 static void mark_ce_used_same_name(struct cache_entry
*ce
,
350 struct unpack_trees_options
*o
)
352 struct index_state
*index
= o
->src_index
;
353 int len
= ce_namelen(ce
);
356 for (pos
= locate_in_src_index(ce
, o
); pos
< index
->cache_nr
; pos
++) {
357 struct cache_entry
*next
= index
->cache
[pos
];
358 if (len
!= ce_namelen(next
) ||
359 memcmp(ce
->name
, next
->name
, len
))
361 mark_ce_used(next
, o
);
365 static struct cache_entry
*next_cache_entry(struct unpack_trees_options
*o
)
367 const struct index_state
*index
= o
->src_index
;
368 int pos
= o
->cache_bottom
;
370 while (pos
< index
->cache_nr
) {
371 struct cache_entry
*ce
= index
->cache
[pos
];
372 if (!(ce
->ce_flags
& CE_UNPACKED
))
379 static void add_same_unmerged(const struct cache_entry
*ce
,
380 struct unpack_trees_options
*o
)
382 struct index_state
*index
= o
->src_index
;
383 int len
= ce_namelen(ce
);
384 int pos
= index_name_pos(index
, ce
->name
, len
);
387 die("programming error in a caller of mark_ce_used_same_name");
388 for (pos
= -pos
- 1; pos
< index
->cache_nr
; pos
++) {
389 struct cache_entry
*next
= index
->cache
[pos
];
390 if (len
!= ce_namelen(next
) ||
391 memcmp(ce
->name
, next
->name
, len
))
393 add_entry(o
, next
, 0, 0);
394 mark_ce_used(next
, o
);
398 static int unpack_index_entry(struct cache_entry
*ce
,
399 struct unpack_trees_options
*o
)
401 const struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
408 if (o
->skip_unmerged
) {
409 add_entry(o
, ce
, 0, 0);
413 ret
= call_unpack_fn(src
, o
);
415 mark_ce_used_same_name(ce
, o
);
419 static int find_cache_pos(struct traverse_info
*, const struct name_entry
*);
421 static void restore_cache_bottom(struct traverse_info
*info
, int bottom
)
423 struct unpack_trees_options
*o
= info
->data
;
425 if (o
->diff_index_cached
)
427 o
->cache_bottom
= bottom
;
430 static int switch_cache_bottom(struct traverse_info
*info
)
432 struct unpack_trees_options
*o
= info
->data
;
435 if (o
->diff_index_cached
)
437 ret
= o
->cache_bottom
;
438 pos
= find_cache_pos(info
->prev
, &info
->name
);
441 o
->cache_bottom
= -2 - pos
;
443 o
->cache_bottom
= o
->src_index
->cache_nr
;
447 static int traverse_trees_recursive(int n
, unsigned long dirmask
,
448 unsigned long df_conflicts
,
449 struct name_entry
*names
,
450 struct traverse_info
*info
)
453 struct tree_desc t
[MAX_UNPACK_TREES
];
454 void *buf
[MAX_UNPACK_TREES
];
455 struct traverse_info newinfo
;
456 struct name_entry
*p
;
464 newinfo
.pathspec
= info
->pathspec
;
466 newinfo
.pathlen
+= tree_entry_len(p
) + 1;
467 newinfo
.df_conflicts
|= df_conflicts
;
469 for (i
= 0; i
< n
; i
++, dirmask
>>= 1) {
470 const unsigned char *sha1
= NULL
;
472 sha1
= names
[i
].sha1
;
473 buf
[i
] = fill_tree_descriptor(t
+i
, sha1
);
476 bottom
= switch_cache_bottom(&newinfo
);
477 ret
= traverse_trees(n
, t
, &newinfo
);
478 restore_cache_bottom(&newinfo
, bottom
);
480 for (i
= 0; i
< n
; i
++)
487 * Compare the traverse-path to the cache entry without actually
488 * having to generate the textual representation of the traverse
491 * NOTE! This *only* compares up to the size of the traverse path
492 * itself - the caller needs to do the final check for the cache
493 * entry having more data at the end!
495 static int do_compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
497 int len
, pathlen
, ce_len
;
501 int cmp
= do_compare_entry(ce
, info
->prev
, &info
->name
);
505 pathlen
= info
->pathlen
;
506 ce_len
= ce_namelen(ce
);
508 /* If ce_len < pathlen then we must have previously hit "name == directory" entry */
509 if (ce_len
< pathlen
)
513 ce_name
= ce
->name
+ pathlen
;
515 len
= tree_entry_len(n
);
516 return df_name_compare(ce_name
, ce_len
, S_IFREG
, n
->path
, len
, n
->mode
);
519 static int compare_entry(const struct cache_entry
*ce
, const struct traverse_info
*info
, const struct name_entry
*n
)
521 int cmp
= do_compare_entry(ce
, info
, n
);
526 * Even if the beginning compared identically, the ce should
527 * compare as bigger than a directory leading up to it!
529 return ce_namelen(ce
) > traverse_path_len(info
, n
);
532 static int ce_in_traverse_path(const struct cache_entry
*ce
,
533 const struct traverse_info
*info
)
537 if (do_compare_entry(ce
, info
->prev
, &info
->name
))
540 * If ce (blob) is the same name as the path (which is a tree
541 * we will be descending into), it won't be inside it.
543 return (info
->pathlen
< ce_namelen(ce
));
546 static struct cache_entry
*create_ce_entry(const struct traverse_info
*info
, const struct name_entry
*n
, int stage
)
548 int len
= traverse_path_len(info
, n
);
549 struct cache_entry
*ce
= xcalloc(1, cache_entry_size(len
));
551 ce
->ce_mode
= create_ce_mode(n
->mode
);
552 ce
->ce_flags
= create_ce_flags(stage
);
553 ce
->ce_namelen
= len
;
554 hashcpy(ce
->sha1
, n
->sha1
);
555 make_traverse_path(ce
->name
, info
, n
);
560 static int unpack_nondirectories(int n
, unsigned long mask
,
561 unsigned long dirmask
,
562 struct cache_entry
**src
,
563 const struct name_entry
*names
,
564 const struct traverse_info
*info
)
567 struct unpack_trees_options
*o
= info
->data
;
568 unsigned long conflicts
= info
->df_conflicts
| dirmask
;
570 /* Do we have *only* directories? Nothing to do */
571 if (mask
== dirmask
&& !src
[0])
575 * Ok, we've filled in up to any potential index entry in src[0],
578 for (i
= 0; i
< n
; i
++) {
580 unsigned int bit
= 1ul << i
;
581 if (conflicts
& bit
) {
582 src
[i
+ o
->merge
] = o
->df_conflict_entry
;
589 else if (i
+ 1 < o
->head_idx
)
591 else if (i
+ 1 > o
->head_idx
)
595 src
[i
+ o
->merge
] = create_ce_entry(info
, names
+ i
, stage
);
599 int rc
= call_unpack_fn((const struct cache_entry
* const *)src
,
601 for (i
= 0; i
< n
; i
++) {
602 struct cache_entry
*ce
= src
[i
+ o
->merge
];
603 if (ce
!= o
->df_conflict_entry
)
609 for (i
= 0; i
< n
; i
++)
610 if (src
[i
] && src
[i
] != o
->df_conflict_entry
)
611 if (do_add_entry(o
, src
[i
], 0, 0))
617 static int unpack_failed(struct unpack_trees_options
*o
, const char *message
)
619 discard_index(&o
->result
);
620 if (!o
->gently
&& !o
->exiting_early
) {
622 return error("%s", message
);
628 /* NEEDSWORK: give this a better name and share with tree-walk.c */
629 static int name_compare(const char *a
, int a_len
,
630 const char *b
, int b_len
)
632 int len
= (a_len
< b_len
) ? a_len
: b_len
;
633 int cmp
= memcmp(a
, b
, len
);
636 return (a_len
- b_len
);
640 * The tree traversal is looking at name p. If we have a matching entry,
641 * return it. If name p is a directory in the index, do not return
642 * anything, as we will want to match it when the traversal descends into
645 static int find_cache_pos(struct traverse_info
*info
,
646 const struct name_entry
*p
)
649 struct unpack_trees_options
*o
= info
->data
;
650 struct index_state
*index
= o
->src_index
;
651 int pfxlen
= info
->pathlen
;
652 int p_len
= tree_entry_len(p
);
654 for (pos
= o
->cache_bottom
; pos
< index
->cache_nr
; pos
++) {
655 const struct cache_entry
*ce
= index
->cache
[pos
];
656 const char *ce_name
, *ce_slash
;
659 if (ce
->ce_flags
& CE_UNPACKED
) {
661 * cache_bottom entry is already unpacked, so
662 * we can never match it; don't check it
665 if (pos
== o
->cache_bottom
)
669 if (!ce_in_traverse_path(ce
, info
))
671 ce_name
= ce
->name
+ pfxlen
;
672 ce_slash
= strchr(ce_name
, '/');
674 ce_len
= ce_slash
- ce_name
;
676 ce_len
= ce_namelen(ce
) - pfxlen
;
677 cmp
= name_compare(p
->path
, p_len
, ce_name
, ce_len
);
679 * Exact match; if we have a directory we need to
680 * delay returning it.
683 return ce_slash
? -2 - pos
: pos
;
685 continue; /* keep looking */
687 * ce_name sorts after p->path; could it be that we
688 * have files under p->path directory in the index?
689 * E.g. ce_name == "t-i", and p->path == "t"; we may
690 * have "t/a" in the index.
692 if (p_len
< ce_len
&& !memcmp(ce_name
, p
->path
, p_len
) &&
693 ce_name
[p_len
] < '/')
694 continue; /* keep looking */
700 static struct cache_entry
*find_cache_entry(struct traverse_info
*info
,
701 const struct name_entry
*p
)
703 int pos
= find_cache_pos(info
, p
);
704 struct unpack_trees_options
*o
= info
->data
;
707 return o
->src_index
->cache
[pos
];
712 static void debug_path(struct traverse_info
*info
)
715 debug_path(info
->prev
);
716 if (*info
->prev
->name
.path
)
719 printf("%s", info
->name
.path
);
722 static void debug_name_entry(int i
, struct name_entry
*n
)
724 printf("ent#%d %06o %s\n", i
,
725 n
->path
? n
->mode
: 0,
726 n
->path
? n
->path
: "(missing)");
729 static void debug_unpack_callback(int n
,
731 unsigned long dirmask
,
732 struct name_entry
*names
,
733 struct traverse_info
*info
)
736 printf("* unpack mask %lu, dirmask %lu, cnt %d ",
740 for (i
= 0; i
< n
; i
++)
741 debug_name_entry(i
, names
+ i
);
744 static int unpack_callback(int n
, unsigned long mask
, unsigned long dirmask
, struct name_entry
*names
, struct traverse_info
*info
)
746 struct cache_entry
*src
[MAX_UNPACK_TREES
+ 1] = { NULL
, };
747 struct unpack_trees_options
*o
= info
->data
;
748 const struct name_entry
*p
= names
;
750 /* Find first entry with a real name (we could use "mask" too) */
755 debug_unpack_callback(n
, mask
, dirmask
, names
, info
);
757 /* Are we supposed to look at the index too? */
761 struct cache_entry
*ce
;
763 if (o
->diff_index_cached
)
764 ce
= next_cache_entry(o
);
766 ce
= find_cache_entry(info
, p
);
770 cmp
= compare_entry(ce
, info
, p
);
772 if (unpack_index_entry(ce
, o
) < 0)
773 return unpack_failed(o
, NULL
);
779 * If we skip unmerged index
780 * entries, we'll skip this
781 * entry *and* the tree
782 * entries associated with it!
784 if (o
->skip_unmerged
) {
785 add_same_unmerged(ce
, o
);
795 if (unpack_nondirectories(n
, mask
, dirmask
, src
, names
, info
) < 0)
798 if (o
->merge
&& src
[0]) {
799 if (ce_stage(src
[0]))
800 mark_ce_used_same_name(src
[0], o
);
802 mark_ce_used(src
[0], o
);
805 /* Now handle any directories.. */
807 /* special case: "diff-index --cached" looking at a tree */
808 if (o
->diff_index_cached
&&
809 n
== 1 && dirmask
== 1 && S_ISDIR(names
->mode
)) {
811 matches
= cache_tree_matches_traversal(o
->src_index
->cache_tree
,
814 * Everything under the name matches; skip the
815 * entire hierarchy. diff_index_cached codepath
816 * special cases D/F conflicts in such a way that
817 * it does not do any look-ahead, so this is safe.
820 o
->cache_bottom
+= matches
;
825 if (traverse_trees_recursive(n
, dirmask
, mask
& ~dirmask
,
834 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
835 struct strbuf
*prefix
,
836 int select_mask
, int clear_mask
,
837 struct exclude_list
*el
, int defval
);
839 /* Whole directory matching */
840 static int clear_ce_flags_dir(struct cache_entry
**cache
, int nr
,
841 struct strbuf
*prefix
,
843 int select_mask
, int clear_mask
,
844 struct exclude_list
*el
, int defval
)
846 struct cache_entry
**cache_end
;
848 int ret
= is_excluded_from_list(prefix
->buf
, prefix
->len
,
849 basename
, &dtype
, el
);
852 strbuf_addch(prefix
, '/');
854 /* If undecided, use matching result of parent dir in defval */
858 for (cache_end
= cache
; cache_end
!= cache
+ nr
; cache_end
++) {
859 struct cache_entry
*ce
= *cache_end
;
860 if (strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
865 * TODO: check el, if there are no patterns that may conflict
866 * with ret (iow, we know in advance the incl/excl
867 * decision for the entire directory), clear flag here without
868 * calling clear_ce_flags_1(). That function will call
869 * the expensive is_excluded_from_list() on every entry.
871 rc
= clear_ce_flags_1(cache
, cache_end
- cache
,
873 select_mask
, clear_mask
,
875 strbuf_setlen(prefix
, prefix
->len
- 1);
880 * Traverse the index, find every entry that matches according to
881 * o->el. Do "ce_flags &= ~clear_mask" on those entries. Return the
882 * number of traversed entries.
884 * If select_mask is non-zero, only entries whose ce_flags has on of
885 * those bits enabled are traversed.
887 * cache : pointer to an index entry
888 * prefix_len : an offset to its path
890 * The current path ("prefix") including the trailing '/' is
891 * cache[0]->name[0..(prefix_len-1)]
892 * Top level path has prefix_len zero.
894 static int clear_ce_flags_1(struct cache_entry
**cache
, int nr
,
895 struct strbuf
*prefix
,
896 int select_mask
, int clear_mask
,
897 struct exclude_list
*el
, int defval
)
899 struct cache_entry
**cache_end
= cache
+ nr
;
902 * Process all entries that have the given prefix and meet
903 * select_mask condition
905 while(cache
!= cache_end
) {
906 struct cache_entry
*ce
= *cache
;
907 const char *name
, *slash
;
910 if (select_mask
&& !(ce
->ce_flags
& select_mask
)) {
915 if (prefix
->len
&& strncmp(ce
->name
, prefix
->buf
, prefix
->len
))
918 name
= ce
->name
+ prefix
->len
;
919 slash
= strchr(name
, '/');
921 /* If it's a directory, try whole directory match first */
926 strbuf_add(prefix
, name
, len
);
928 processed
= clear_ce_flags_dir(cache
, cache_end
- cache
,
930 prefix
->buf
+ prefix
->len
- len
,
931 select_mask
, clear_mask
,
934 /* clear_c_f_dir eats a whole dir already? */
937 strbuf_setlen(prefix
, prefix
->len
- len
);
941 strbuf_addch(prefix
, '/');
942 cache
+= clear_ce_flags_1(cache
, cache_end
- cache
,
944 select_mask
, clear_mask
, el
, defval
);
945 strbuf_setlen(prefix
, prefix
->len
- len
- 1);
950 dtype
= ce_to_dtype(ce
);
951 ret
= is_excluded_from_list(ce
->name
, ce_namelen(ce
),
956 ce
->ce_flags
&= ~clear_mask
;
959 return nr
- (cache_end
- cache
);
962 static int clear_ce_flags(struct cache_entry
**cache
, int nr
,
963 int select_mask
, int clear_mask
,
964 struct exclude_list
*el
)
966 static struct strbuf prefix
= STRBUF_INIT
;
968 strbuf_reset(&prefix
);
970 return clear_ce_flags_1(cache
, nr
,
972 select_mask
, clear_mask
,
977 * Set/Clear CE_NEW_SKIP_WORKTREE according to $GIT_DIR/info/sparse-checkout
979 static void mark_new_skip_worktree(struct exclude_list
*el
,
980 struct index_state
*the_index
,
981 int select_flag
, int skip_wt_flag
)
986 * 1. Pretend the narrowest worktree: only unmerged entries
989 for (i
= 0; i
< the_index
->cache_nr
; i
++) {
990 struct cache_entry
*ce
= the_index
->cache
[i
];
992 if (select_flag
&& !(ce
->ce_flags
& select_flag
))
996 ce
->ce_flags
|= skip_wt_flag
;
998 ce
->ce_flags
&= ~skip_wt_flag
;
1002 * 2. Widen worktree according to sparse-checkout file.
1003 * Matched entries will have skip_wt_flag cleared (i.e. "in")
1005 clear_ce_flags(the_index
->cache
, the_index
->cache_nr
,
1006 select_flag
, skip_wt_flag
, el
);
1009 static int verify_absent(const struct cache_entry
*,
1010 enum unpack_trees_error_types
,
1011 struct unpack_trees_options
*);
1013 * N-way merge "len" trees. Returns 0 on success, -1 on failure to manipulate the
1014 * resulting index, -2 on failure to reflect the changes to the work tree.
1016 * CE_ADDED, CE_UNPACKED and CE_NEW_SKIP_WORKTREE are used internally
1018 int unpack_trees(unsigned len
, struct tree_desc
*t
, struct unpack_trees_options
*o
)
1021 static struct cache_entry
*dfc
;
1022 struct exclude_list el
;
1024 if (len
> MAX_UNPACK_TREES
)
1025 die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES
);
1026 memset(&state
, 0, sizeof(state
));
1027 state
.base_dir
= "";
1030 state
.refresh_cache
= 1;
1032 memset(&el
, 0, sizeof(el
));
1033 if (!core_apply_sparse_checkout
|| !o
->update
)
1034 o
->skip_sparse_checkout
= 1;
1035 if (!o
->skip_sparse_checkout
) {
1036 if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, &el
, 0) < 0)
1037 o
->skip_sparse_checkout
= 1;
1042 memset(&o
->result
, 0, sizeof(o
->result
));
1043 o
->result
.initialized
= 1;
1044 o
->result
.timestamp
.sec
= o
->src_index
->timestamp
.sec
;
1045 o
->result
.timestamp
.nsec
= o
->src_index
->timestamp
.nsec
;
1046 o
->result
.version
= o
->src_index
->version
;
1047 o
->merge_size
= len
;
1048 mark_all_ce_unused(o
->src_index
);
1051 * Sparse checkout loop #1: set NEW_SKIP_WORKTREE on existing entries
1053 if (!o
->skip_sparse_checkout
)
1054 mark_new_skip_worktree(o
->el
, o
->src_index
, 0, CE_NEW_SKIP_WORKTREE
);
1057 dfc
= xcalloc(1, cache_entry_size(0));
1058 o
->df_conflict_entry
= dfc
;
1061 const char *prefix
= o
->prefix
? o
->prefix
: "";
1062 struct traverse_info info
;
1064 setup_traverse_info(&info
, prefix
);
1065 info
.fn
= unpack_callback
;
1067 info
.show_all_errors
= o
->show_all_errors
;
1068 info
.pathspec
= o
->pathspec
;
1072 * Unpack existing index entries that sort before the
1073 * prefix the tree is spliced into. Note that o->merge
1074 * is always true in this case.
1077 struct cache_entry
*ce
= next_cache_entry(o
);
1080 if (ce_in_traverse_path(ce
, &info
))
1082 if (unpack_index_entry(ce
, o
) < 0)
1087 if (traverse_trees(len
, t
, &info
) < 0)
1091 /* Any left-over entries in the index? */
1094 struct cache_entry
*ce
= next_cache_entry(o
);
1097 if (unpack_index_entry(ce
, o
) < 0)
1101 mark_all_ce_unused(o
->src_index
);
1103 if (o
->trivial_merges_only
&& o
->nontrivial_merge
) {
1104 ret
= unpack_failed(o
, "Merge requires file-level merging");
1108 if (!o
->skip_sparse_checkout
) {
1109 int empty_worktree
= 1;
1112 * Sparse checkout loop #2: set NEW_SKIP_WORKTREE on entries not in loop #1
1113 * If the will have NEW_SKIP_WORKTREE, also set CE_SKIP_WORKTREE
1114 * so apply_sparse_checkout() won't attempt to remove it from worktree
1116 mark_new_skip_worktree(o
->el
, &o
->result
, CE_ADDED
, CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1119 for (i
= 0; i
< o
->result
.cache_nr
; i
++) {
1120 struct cache_entry
*ce
= o
->result
.cache
[i
];
1123 * Entries marked with CE_ADDED in merged_entry() do not have
1124 * verify_absent() check (the check is effectively disabled
1125 * because CE_NEW_SKIP_WORKTREE is set unconditionally).
1127 * Do the real check now because we have had
1128 * correct CE_NEW_SKIP_WORKTREE
1130 if (ce
->ce_flags
& CE_ADDED
&&
1131 verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1132 if (!o
->show_all_errors
)
1137 if (apply_sparse_checkout(ce
, o
)) {
1138 if (!o
->show_all_errors
)
1142 if (!ce_skip_worktree(ce
))
1149 * Sparse checkout is meant to narrow down checkout area
1150 * but it does not make sense to narrow down to empty working
1151 * tree. This is usually a mistake in sparse checkout rules.
1152 * Do not allow users to do that.
1154 if (o
->result
.cache_nr
&& empty_worktree
) {
1155 ret
= unpack_failed(o
, "Sparse checkout leaves no entry on working directory");
1160 o
->src_index
= NULL
;
1161 ret
= check_updates(o
) ? (-2) : 0;
1163 discard_index(o
->dst_index
);
1164 *o
->dst_index
= o
->result
;
1168 clear_exclude_list(&el
);
1172 if (o
->show_all_errors
)
1173 display_error_msgs(o
);
1174 mark_all_ce_unused(o
->src_index
);
1175 ret
= unpack_failed(o
, NULL
);
1176 if (o
->exiting_early
)
1181 /* Here come the merge functions */
1183 static int reject_merge(const struct cache_entry
*ce
,
1184 struct unpack_trees_options
*o
)
1186 return add_rejected_path(o
, ERROR_WOULD_OVERWRITE
, ce
->name
);
1189 static int same(const struct cache_entry
*a
, const struct cache_entry
*b
)
1195 if ((a
->ce_flags
| b
->ce_flags
) & CE_CONFLICTED
)
1197 return a
->ce_mode
== b
->ce_mode
&&
1198 !hashcmp(a
->sha1
, b
->sha1
);
1203 * When a CE gets turned into an unmerged entry, we
1204 * want it to be up-to-date
1206 static int verify_uptodate_1(const struct cache_entry
*ce
,
1207 struct unpack_trees_options
*o
,
1208 enum unpack_trees_error_types error_type
)
1216 * CE_VALID and CE_SKIP_WORKTREE cheat, we better check again
1217 * if this entry is truly up-to-date because this file may be
1220 if ((ce
->ce_flags
& CE_VALID
) || ce_skip_worktree(ce
))
1221 ; /* keep checking */
1222 else if (o
->reset
|| ce_uptodate(ce
))
1225 if (!lstat(ce
->name
, &st
)) {
1226 int flags
= CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
;
1227 unsigned changed
= ie_match_stat(o
->src_index
, ce
, &st
, flags
);
1231 * NEEDSWORK: the current default policy is to allow
1232 * submodule to be out of sync wrt the superproject
1233 * index. This needs to be tightened later for
1234 * submodules that are marked to be automatically
1237 if (S_ISGITLINK(ce
->ce_mode
))
1241 if (errno
== ENOENT
)
1243 return o
->gently
? -1 :
1244 add_rejected_path(o
, error_type
, ce
->name
);
1247 static int verify_uptodate(const struct cache_entry
*ce
,
1248 struct unpack_trees_options
*o
)
1250 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1252 return verify_uptodate_1(ce
, o
, ERROR_NOT_UPTODATE_FILE
);
1255 static int verify_uptodate_sparse(const struct cache_entry
*ce
,
1256 struct unpack_trees_options
*o
)
1258 return verify_uptodate_1(ce
, o
, ERROR_SPARSE_NOT_UPTODATE_FILE
);
1261 static void invalidate_ce_path(const struct cache_entry
*ce
,
1262 struct unpack_trees_options
*o
)
1265 cache_tree_invalidate_path(o
->src_index
->cache_tree
, ce
->name
);
1269 * Check that checking out ce->sha1 in subdir ce->name is not
1270 * going to overwrite any working files.
1272 * Currently, git does not checkout subprojects during a superproject
1273 * checkout, so it is not going to overwrite anything.
1275 static int verify_clean_submodule(const struct cache_entry
*ce
,
1276 enum unpack_trees_error_types error_type
,
1277 struct unpack_trees_options
*o
)
1282 static int verify_clean_subdirectory(const struct cache_entry
*ce
,
1283 enum unpack_trees_error_types error_type
,
1284 struct unpack_trees_options
*o
)
1287 * we are about to extract "ce->name"; we would not want to lose
1288 * anything in the existing directory there.
1292 struct dir_struct d
;
1295 unsigned char sha1
[20];
1297 if (S_ISGITLINK(ce
->ce_mode
) &&
1298 resolve_gitlink_ref(ce
->name
, "HEAD", sha1
) == 0) {
1299 /* If we are not going to update the submodule, then
1302 if (!hashcmp(sha1
, ce
->sha1
))
1304 return verify_clean_submodule(ce
, error_type
, o
);
1308 * First let's make sure we do not have a local modification
1309 * in that directory.
1311 namelen
= ce_namelen(ce
);
1312 for (i
= locate_in_src_index(ce
, o
);
1313 i
< o
->src_index
->cache_nr
;
1315 struct cache_entry
*ce2
= o
->src_index
->cache
[i
];
1316 int len
= ce_namelen(ce2
);
1317 if (len
< namelen
||
1318 strncmp(ce
->name
, ce2
->name
, namelen
) ||
1319 ce2
->name
[namelen
] != '/')
1322 * ce2->name is an entry in the subdirectory to be
1325 if (!ce_stage(ce2
)) {
1326 if (verify_uptodate(ce2
, o
))
1328 add_entry(o
, ce2
, CE_REMOVE
, 0);
1329 mark_ce_used(ce2
, o
);
1335 * Then we need to make sure that we do not lose a locally
1336 * present file that is not ignored.
1338 pathbuf
= xmalloc(namelen
+ 2);
1339 memcpy(pathbuf
, ce
->name
, namelen
);
1340 strcpy(pathbuf
+namelen
, "/");
1342 memset(&d
, 0, sizeof(d
));
1344 d
.exclude_per_dir
= o
->dir
->exclude_per_dir
;
1345 i
= read_directory(&d
, pathbuf
, namelen
+1, NULL
);
1347 return o
->gently
? -1 :
1348 add_rejected_path(o
, ERROR_NOT_UPTODATE_DIR
, ce
->name
);
1354 * This gets called when there was no index entry for the tree entry 'dst',
1355 * but we found a file in the working tree that 'lstat()' said was fine,
1356 * and we're on a case-insensitive filesystem.
1358 * See if we can find a case-insensitive match in the index that also
1359 * matches the stat information, and assume it's that other file!
1361 static int icase_exists(struct unpack_trees_options
*o
, const char *name
, int len
, struct stat
*st
)
1363 const struct cache_entry
*src
;
1365 src
= index_file_exists(o
->src_index
, name
, len
, 1);
1366 return src
&& !ie_match_stat(o
->src_index
, src
, st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
);
1369 static int check_ok_to_remove(const char *name
, int len
, int dtype
,
1370 const struct cache_entry
*ce
, struct stat
*st
,
1371 enum unpack_trees_error_types error_type
,
1372 struct unpack_trees_options
*o
)
1374 const struct cache_entry
*result
;
1377 * It may be that the 'lstat()' succeeded even though
1378 * target 'ce' was absent, because there is an old
1379 * entry that is different only in case..
1381 * Ignore that lstat() if it matches.
1383 if (ignore_case
&& icase_exists(o
, name
, len
, st
))
1387 is_excluded(o
->dir
, name
, &dtype
))
1389 * ce->name is explicitly excluded, so it is Ok to
1393 if (S_ISDIR(st
->st_mode
)) {
1395 * We are checking out path "foo" and
1396 * found "foo/." in the working tree.
1397 * This is tricky -- if we have modified
1398 * files that are in "foo/" we would lose
1401 if (verify_clean_subdirectory(ce
, error_type
, o
) < 0)
1407 * The previous round may already have decided to
1408 * delete this path, which is in a subdirectory that
1409 * is being replaced with a blob.
1411 result
= index_file_exists(&o
->result
, name
, len
, 0);
1413 if (result
->ce_flags
& CE_REMOVE
)
1417 return o
->gently
? -1 :
1418 add_rejected_path(o
, error_type
, name
);
1422 * We do not want to remove or overwrite a working tree file that
1423 * is not tracked, unless it is ignored.
1425 static int verify_absent_1(const struct cache_entry
*ce
,
1426 enum unpack_trees_error_types error_type
,
1427 struct unpack_trees_options
*o
)
1432 if (o
->index_only
|| o
->reset
|| !o
->update
)
1435 len
= check_leading_path(ce
->name
, ce_namelen(ce
));
1439 char path
[PATH_MAX
+ 1];
1440 memcpy(path
, ce
->name
, len
);
1442 if (lstat(path
, &st
))
1443 return error("cannot stat '%s': %s", path
,
1446 return check_ok_to_remove(path
, len
, DT_UNKNOWN
, NULL
, &st
,
1448 } else if (lstat(ce
->name
, &st
)) {
1449 if (errno
!= ENOENT
)
1450 return error("cannot stat '%s': %s", ce
->name
,
1454 return check_ok_to_remove(ce
->name
, ce_namelen(ce
),
1455 ce_to_dtype(ce
), ce
, &st
,
1460 static int verify_absent(const struct cache_entry
*ce
,
1461 enum unpack_trees_error_types error_type
,
1462 struct unpack_trees_options
*o
)
1464 if (!o
->skip_sparse_checkout
&& (ce
->ce_flags
& CE_NEW_SKIP_WORKTREE
))
1466 return verify_absent_1(ce
, error_type
, o
);
1469 static int verify_absent_sparse(const struct cache_entry
*ce
,
1470 enum unpack_trees_error_types error_type
,
1471 struct unpack_trees_options
*o
)
1473 enum unpack_trees_error_types orphaned_error
= error_type
;
1474 if (orphaned_error
== ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
)
1475 orphaned_error
= ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN
;
1477 return verify_absent_1(ce
, orphaned_error
, o
);
1480 static int merged_entry(const struct cache_entry
*ce
,
1481 const struct cache_entry
*old
,
1482 struct unpack_trees_options
*o
)
1484 int update
= CE_UPDATE
;
1485 struct cache_entry
*merge
= dup_entry(ce
);
1489 * New index entries. In sparse checkout, the following
1490 * verify_absent() will be delayed until after
1491 * traverse_trees() finishes in unpack_trees(), then:
1493 * - CE_NEW_SKIP_WORKTREE will be computed correctly
1494 * - verify_absent() be called again, this time with
1495 * correct CE_NEW_SKIP_WORKTREE
1497 * verify_absent() call here does nothing in sparse
1498 * checkout (i.e. o->skip_sparse_checkout == 0)
1501 merge
->ce_flags
|= CE_NEW_SKIP_WORKTREE
;
1503 if (verify_absent(merge
,
1504 ERROR_WOULD_LOSE_UNTRACKED_OVERWRITTEN
, o
)) {
1508 invalidate_ce_path(merge
, o
);
1509 } else if (!(old
->ce_flags
& CE_CONFLICTED
)) {
1511 * See if we can re-use the old CE directly?
1512 * That way we get the uptodate stat info.
1514 * This also removes the UPDATE flag on a match; otherwise
1515 * we will end up overwriting local changes in the work tree.
1517 if (same(old
, merge
)) {
1518 copy_cache_entry(merge
, old
);
1521 if (verify_uptodate(old
, o
)) {
1525 /* Migrate old flags over */
1526 update
|= old
->ce_flags
& (CE_SKIP_WORKTREE
| CE_NEW_SKIP_WORKTREE
);
1527 invalidate_ce_path(old
, o
);
1531 * Previously unmerged entry left as an existence
1532 * marker by read_index_unmerged();
1534 invalidate_ce_path(old
, o
);
1537 do_add_entry(o
, merge
, update
, CE_STAGEMASK
);
1541 static int deleted_entry(const struct cache_entry
*ce
,
1542 const struct cache_entry
*old
,
1543 struct unpack_trees_options
*o
)
1545 /* Did it exist in the index? */
1547 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1551 if (!(old
->ce_flags
& CE_CONFLICTED
) && verify_uptodate(old
, o
))
1553 add_entry(o
, ce
, CE_REMOVE
, 0);
1554 invalidate_ce_path(ce
, o
);
1558 static int keep_entry(const struct cache_entry
*ce
,
1559 struct unpack_trees_options
*o
)
1561 add_entry(o
, ce
, 0, 0);
1566 static void show_stage_entry(FILE *o
,
1567 const char *label
, const struct cache_entry
*ce
)
1570 fprintf(o
, "%s (missing)\n", label
);
1572 fprintf(o
, "%s%06o %s %d\t%s\n",
1575 sha1_to_hex(ce
->sha1
),
1581 int threeway_merge(const struct cache_entry
* const *stages
,
1582 struct unpack_trees_options
*o
)
1584 const struct cache_entry
*index
;
1585 const struct cache_entry
*head
;
1586 const struct cache_entry
*remote
= stages
[o
->head_idx
+ 1];
1589 int remote_match
= 0;
1591 int df_conflict_head
= 0;
1592 int df_conflict_remote
= 0;
1594 int any_anc_missing
= 0;
1595 int no_anc_exists
= 1;
1598 for (i
= 1; i
< o
->head_idx
; i
++) {
1599 if (!stages
[i
] || stages
[i
] == o
->df_conflict_entry
)
1600 any_anc_missing
= 1;
1606 head
= stages
[o
->head_idx
];
1608 if (head
== o
->df_conflict_entry
) {
1609 df_conflict_head
= 1;
1613 if (remote
== o
->df_conflict_entry
) {
1614 df_conflict_remote
= 1;
1619 * First, if there's a #16 situation, note that to prevent #13
1622 if (!same(remote
, head
)) {
1623 for (i
= 1; i
< o
->head_idx
; i
++) {
1624 if (same(stages
[i
], head
)) {
1627 if (same(stages
[i
], remote
)) {
1634 * We start with cases where the index is allowed to match
1635 * something other than the head: #14(ALT) and #2ALT, where it
1636 * is permitted to match the result instead.
1638 /* #14, #14ALT, #2ALT */
1639 if (remote
&& !df_conflict_head
&& head_match
&& !remote_match
) {
1640 if (index
&& !same(index
, remote
) && !same(index
, head
))
1641 return o
->gently
? -1 : reject_merge(index
, o
);
1642 return merged_entry(remote
, index
, o
);
1645 * If we have an entry in the index cache, then we want to
1646 * make sure that it matches head.
1648 if (index
&& !same(index
, head
))
1649 return o
->gently
? -1 : reject_merge(index
, o
);
1653 if (same(head
, remote
))
1654 return merged_entry(head
, index
, o
);
1656 if (!df_conflict_remote
&& remote_match
&& !head_match
)
1657 return merged_entry(head
, index
, o
);
1661 if (!head
&& !remote
&& any_anc_missing
)
1665 * Under the "aggressive" rule, we resolve mostly trivial
1666 * cases that we historically had git-merge-one-file resolve.
1668 if (o
->aggressive
) {
1669 int head_deleted
= !head
;
1670 int remote_deleted
= !remote
;
1671 const struct cache_entry
*ce
= NULL
;
1680 for (i
= 1; i
< o
->head_idx
; i
++) {
1681 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1690 * Deleted in one and unchanged in the other.
1692 if ((head_deleted
&& remote_deleted
) ||
1693 (head_deleted
&& remote
&& remote_match
) ||
1694 (remote_deleted
&& head
&& head_match
)) {
1696 return deleted_entry(index
, index
, o
);
1697 if (ce
&& !head_deleted
) {
1698 if (verify_absent(ce
, ERROR_WOULD_LOSE_UNTRACKED_REMOVED
, o
))
1704 * Added in both, identically.
1706 if (no_anc_exists
&& head
&& remote
&& same(head
, remote
))
1707 return merged_entry(head
, index
, o
);
1711 /* Below are "no merge" cases, which require that the index be
1712 * up-to-date to avoid the files getting overwritten with
1713 * conflict resolution files.
1716 if (verify_uptodate(index
, o
))
1720 o
->nontrivial_merge
= 1;
1722 /* #2, #3, #4, #6, #7, #9, #10, #11. */
1724 if (!head_match
|| !remote_match
) {
1725 for (i
= 1; i
< o
->head_idx
; i
++) {
1726 if (stages
[i
] && stages
[i
] != o
->df_conflict_entry
) {
1727 keep_entry(stages
[i
], o
);
1735 fprintf(stderr
, "read-tree: warning #16 detected\n");
1736 show_stage_entry(stderr
, "head ", stages
[head_match
]);
1737 show_stage_entry(stderr
, "remote ", stages
[remote_match
]);
1740 if (head
) { count
+= keep_entry(head
, o
); }
1741 if (remote
) { count
+= keep_entry(remote
, o
); }
1748 * The rule is to "carry forward" what is in the index without losing
1749 * information across a "fast-forward", favoring a successful merge
1750 * over a merge failure when it makes sense. For details of the
1751 * "carry forward" rule, please see <Documentation/git-read-tree.txt>.
1754 int twoway_merge(const struct cache_entry
* const *src
,
1755 struct unpack_trees_options
*o
)
1757 const struct cache_entry
*current
= src
[0];
1758 const struct cache_entry
*oldtree
= src
[1];
1759 const struct cache_entry
*newtree
= src
[2];
1761 if (o
->merge_size
!= 2)
1762 return error("Cannot do a twoway merge of %d trees",
1765 if (oldtree
== o
->df_conflict_entry
)
1767 if (newtree
== o
->df_conflict_entry
)
1771 if (current
->ce_flags
& CE_CONFLICTED
) {
1772 if (same(oldtree
, newtree
) || o
->reset
) {
1774 return deleted_entry(current
, current
, o
);
1776 return merged_entry(newtree
, current
, o
);
1778 return o
->gently
? -1 : reject_merge(current
, o
);
1780 else if ((!oldtree
&& !newtree
) || /* 4 and 5 */
1781 (!oldtree
&& newtree
&&
1782 same(current
, newtree
)) || /* 6 and 7 */
1783 (oldtree
&& newtree
&&
1784 same(oldtree
, newtree
)) || /* 14 and 15 */
1785 (oldtree
&& newtree
&&
1786 !same(oldtree
, newtree
) && /* 18 and 19 */
1787 same(current
, newtree
))) {
1788 return keep_entry(current
, o
);
1790 else if (oldtree
&& !newtree
&& same(current
, oldtree
)) {
1792 return deleted_entry(oldtree
, current
, o
);
1794 else if (oldtree
&& newtree
&&
1795 same(current
, oldtree
) && !same(current
, newtree
)) {
1797 return merged_entry(newtree
, current
, o
);
1800 /* all other failures */
1802 return o
->gently
? -1 : reject_merge(oldtree
, o
);
1804 return o
->gently
? -1 : reject_merge(current
, o
);
1806 return o
->gently
? -1 : reject_merge(newtree
, o
);
1811 if (oldtree
&& !o
->initial_checkout
) {
1813 * deletion of the path was staged;
1815 if (same(oldtree
, newtree
))
1817 return reject_merge(oldtree
, o
);
1819 return merged_entry(newtree
, current
, o
);
1821 return deleted_entry(oldtree
, current
, o
);
1827 * Keep the index entries at stage0, collapse stage1 but make sure
1828 * stage0 does not have anything there.
1830 int bind_merge(const struct cache_entry
* const *src
,
1831 struct unpack_trees_options
*o
)
1833 const struct cache_entry
*old
= src
[0];
1834 const struct cache_entry
*a
= src
[1];
1836 if (o
->merge_size
!= 1)
1837 return error("Cannot do a bind merge of %d trees",
1840 return o
->gently
? -1 :
1841 error(ERRORMSG(o
, ERROR_BIND_OVERLAP
), a
->name
, old
->name
);
1843 return keep_entry(old
, o
);
1845 return merged_entry(a
, NULL
, o
);
1852 * - take the stat information from stage0, take the data from stage1
1854 int oneway_merge(const struct cache_entry
* const *src
,
1855 struct unpack_trees_options
*o
)
1857 const struct cache_entry
*old
= src
[0];
1858 const struct cache_entry
*a
= src
[1];
1860 if (o
->merge_size
!= 1)
1861 return error("Cannot do a oneway merge of %d trees",
1864 if (!a
|| a
== o
->df_conflict_entry
)
1865 return deleted_entry(old
, old
, o
);
1867 if (old
&& same(old
, a
)) {
1869 if (o
->reset
&& o
->update
&& !ce_uptodate(old
) && !ce_skip_worktree(old
)) {
1871 if (lstat(old
->name
, &st
) ||
1872 ie_match_stat(o
->src_index
, old
, &st
, CE_MATCH_IGNORE_VALID
|CE_MATCH_IGNORE_SKIP_WORKTREE
))
1873 update
|= CE_UPDATE
;
1875 add_entry(o
, old
, update
, 0);
1878 return merged_entry(a
, old
, o
);