]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 089d82b) | patch
merge-ort: process_renames() now needs more defensiveness
authorElijah Newren <newren@gmail.com>
Tue, 19 Jan 2021 19:53:52 +0000 (19:53 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 21 Jan 2021 06:18:55 +0000 (22:18 -0800)
commit1b6b902d95a5b2c5677b6351c670202dae7cd230
tree468e4cbc748f450010033fe03e8a6d056a0643d1tree | snapshot
parent089d82bc18514d78513a85e95de257f74da18205commit | diff
merge-ort: process_renames() now needs more defensiveness

Since directory rename detection adds new paths to opt->priv->paths and
removes old ones, process_renames() needs to now check whether
pair->one->path actually exists in opt->priv->paths instead of just
assuming it does.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-ort.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.