diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-08-30 00:55:14 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-08-30 00:55:14 +0300 |
| commit | 56ba6245a4c171dd03ab3667e9e99c1eaac46e72 (patch) | |
| tree | b0951241b3fcd02fd978a8e7694c4914521e6bfa /merge-ort.c | |
| parent | 10ccb50b163d7a204495fe8ba11fe7c54c335163 (diff) | |
| parent | ff033db7a8afbed5d2ba407ebd929e6898637194 (diff) | |
Merge branch 'en/ort-unused-code-removal'
Code clean-up.
* en/ort-unused-code-removal:
merge-ort: remove code obsoleted by other changes
Diffstat (limited to 'merge-ort.c')
| -rw-r--r-- | merge-ort.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/merge-ort.c b/merge-ort.c index e634a7624a..99dcee2db8 100644 --- a/merge-ort.c +++ b/merge-ort.c @@ -507,7 +507,6 @@ enum conflict_and_info_types { CONFLICT_FILE_DIRECTORY, CONFLICT_DISTINCT_MODES, CONFLICT_MODIFY_DELETE, - CONFLICT_PRESENT_DESPITE_SKIPPED, /* Regular rename */ CONFLICT_RENAME_RENAME, /* same file renamed differently */ @@ -553,8 +552,6 @@ static const char *type_short_descriptions[] = { [CONFLICT_FILE_DIRECTORY] = "CONFLICT (file/directory)", [CONFLICT_DISTINCT_MODES] = "CONFLICT (distinct modes)", [CONFLICT_MODIFY_DELETE] = "CONFLICT (modify/delete)", - [CONFLICT_PRESENT_DESPITE_SKIPPED] = - "CONFLICT (upgrade your version of git)", /*** Regular rename ***/ [CONFLICT_RENAME_RENAME] = "CONFLICT (rename/rename)", @@ -770,8 +767,7 @@ static void path_msg(struct merge_options *opt, /* Sanity checks */ assert(omittable_hint == !starts_with(type_short_descriptions[type], "CONFLICT") || - type == CONFLICT_DIR_RENAME_SUGGESTED || - type == CONFLICT_PRESENT_DESPITE_SKIPPED); + type == CONFLICT_DIR_RENAME_SUGGESTED); if (opt->record_conflict_msgs_as_headers && omittable_hint) return; /* Do not record mere hints in headers */ if (opt->priv->call_depth && opt->verbosity < 5) @@ -4424,22 +4420,8 @@ static int record_conflicted_index_entries(struct merge_options *opt) * the CE_SKIP_WORKTREE bit and manually write those * files to the working disk here. */ - if (ce_skip_worktree(ce)) { - struct stat st; - - if (!lstat(path, &st)) { - char *new_name = unique_path(opt, - path, - "cruft"); - - path_msg(opt, CONFLICT_PRESENT_DESPITE_SKIPPED, 1, - path, NULL, NULL, NULL, - _("Note: %s not up to date and in way of checking out conflicted version; old copy renamed to %s"), - path, new_name); - errs |= rename(path, new_name); - } + if (ce_skip_worktree(ce)) errs |= checkout_entry(ce, &state, NULL, NULL); - } /* * Mark this cache entry for removal and instead add |