aboutsummaryrefslogtreecommitdiffstats
path: root/commit-graph.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-07-31 15:44:06 -0700
committerJunio C Hamano <gitster@pobox.com>2023-07-31 16:08:00 -0700
commitc0a4ae7f4e010204f8341dcc3b9217dd42baee14 (patch)
tree49febf997ae993bac2b7c36d79aab30f2fc337f3 /commit-graph.c
parentupdate-index: use unmerge_index_entry() to support removal (diff)
downloadgit-c0a4ae7f4e010204f8341dcc3b9217dd42baee14.tar.gz
git-c0a4ae7f4e010204f8341dcc3b9217dd42baee14.zip
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 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions