diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-08-01 01:44:06 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-08-01 02:08:00 +0300 |
commit | c0a4ae7f4e010204f8341dcc3b9217dd42baee14 (patch) | |
tree | 49febf997ae993bac2b7c36d79aab30f2fc337f3 /builtin/update-index.c | |
parent | 35901f1c2461640019e70bbefecdce1f59f660d2 (diff) |
update-index: remove stale fallback code for "--unresolve"
The "update-index --unresolve" is a relatively old feature that was
introduced in Git v1.4.1 (June 2006), which predates the
resolve-undo extension introduced in Git v1.7.0 (February 2010).
The original code that was limited only to work during a merge (and
not during a rebase or a cherry-pick) has been kept as the fallback
codepath to be used as a transition measure.
By now, for more than 10 years we have stored resolve-undo extension
in the index file, and the fallback code way outlived its usefulness.
Remove it, together with two file-scope static global variables.
One of these variables is still used by surviving function, but it
does not have to be a global at all, so move it to local to that
function.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/update-index.c')
-rw-r--r-- | builtin/update-index.c | 114 |
1 files changed, 12 insertions, 102 deletions
diff --git a/builtin/update-index.c b/builtin/update-index.c index ecd1c0c2d3..def7f98504 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -608,9 +608,6 @@ static const char * const update_index_usage[] = { NULL }; -static struct object_id head_oid; -static struct object_id merge_head_oid; - static struct cache_entry *read_one_ent(const char *which, struct object_id *ent, const char *path, int namelen, int stage) @@ -639,107 +636,19 @@ static struct cache_entry *read_one_ent(const char *which, return ce; } -static int read_head_pointers(void) -{ - static int result = -2; /* unknown yet */ - - if (result == -2) { - result = -1; - if (read_ref("HEAD", &head_oid)) - return error("No HEAD -- no initial commit yet?"); - if (read_ref("MERGE_HEAD", &merge_head_oid)) - return error("Not in the middle of a merge"); - result = 0; - } - return result; -} - static int unresolve_one(const char *path) { - int namelen = strlen(path); - int pos; - int ret = 0; - struct cache_entry *ce_2 = NULL, *ce_3 = NULL; - struct resolve_undo_info *ru = NULL; - - if (the_index.resolve_undo) { - struct string_list_item *item; - item = string_list_lookup(the_index.resolve_undo, path); - if (item) { - ru = item->util; - item->util = NULL; - } - } - - /* resolve-undo record exists for the path */ - if (ru) { - ret = unmerge_index_entry(&the_index, path, ru); - free(ru); - return ret; - } - - /* See if there is such entry in the index. */ - pos = index_name_pos(&the_index, path, namelen); - if (0 <= pos) { - ; /* resolve-undo record was used already -- fall back */ - } else { - /* Is it unmerged? */ - pos = -pos - 1; - if (pos < the_index.cache_nr) { - const struct cache_entry *ce = the_index.cache[pos]; - if (ce_namelen(ce) == namelen && - !memcmp(ce->name, path, namelen)) { - fprintf(stderr, - "%s: skipping still unmerged path.\n", - path); - } - goto free_return; - } - /* No, such a path does not exist -- removed */ - } - - /* - * We are not using resolve-undo information but just - * populating the stages #2 and #3 from HEAD and MERGE_HEAD. - * - * This is a flawed replacement of true "unresolve", as we do - * not have a way to recreate the stage #1 for the common - * ancestor (which may not be a unique merge-base between the - * two). - */ - if (read_head_pointers()) { - ret = -1; - goto free_return; - } - - ce_2 = read_one_ent("our", &head_oid, path, namelen, 2); - ce_3 = read_one_ent("their", &merge_head_oid, path, namelen, 3); - - if (!ce_2 || !ce_3) { - ret = -1; - goto free_return; - } - if (oideq(&ce_2->oid, &ce_3->oid) && - ce_2->ce_mode == ce_3->ce_mode) { - fprintf(stderr, "%s: identical in both, skipping.\n", - path); - goto free_return; - } - - remove_file_from_index(&the_index, path); - if (add_index_entry(&the_index, ce_2, ADD_CACHE_OK_TO_ADD)) { - error("%s: cannot add our version to the index.", path); - ret = -1; - goto free_return; - } - if (!add_index_entry(&the_index, ce_3, ADD_CACHE_OK_TO_ADD)) - return 0; - error("%s: cannot add their version to the index.", path); - ret = -1; - free_return: - discard_cache_entry(ce_2); - discard_cache_entry(ce_3); - return ret; + struct string_list_item *item; + int res = 0; + + if (!the_index.resolve_undo) + return res; + item = string_list_lookup(the_index.resolve_undo, path); + if (!item) + return res; /* no resolve-undo record for the path */ + res = unmerge_index_entry(&the_index, path, item->util); + FREE_AND_NULL(item->util); + return res; } static int do_unresolve(int ac, const char **av, @@ -766,6 +675,7 @@ static int do_reupdate(const char **paths, int pos; int has_head = 1; struct pathspec pathspec; + struct object_id head_oid; parse_pathspec(&pathspec, 0, PATHSPEC_PREFER_CWD, |