Skip to content
Snippets Groups Projects
Commit dcb00d5c397a authored by Raphaël Gomès's avatar Raphaël Gomès
Browse files

admin-verify: pass p1 down to the dirstate function

This was forgotten and can break with certain kinds of corruption.
parent c1b6b8b03e48
No related branches found
No related tags found
3 merge requests!854Merge stable into default,!852Dirstate-v2: catch corruption before writing it to disk,!851admin-verify: pass p1 down to the dirstate function
......@@ -37,8 +37,7 @@
is_narrow = requirements.NARROW_REQUIREMENT in repo.requirements
narrow_matcher = repo.narrowmatch() if is_narrow else None
for err in repo.dirstate.verify(m1, m2, narrow_matcher):
for err in repo.dirstate.verify(m1, m2, parent1, narrow_matcher):
ui.warn(err[0] % err[1:])
errors += 1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment