mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
merge: minor nullid cleanup
This commit is contained in:
parent
7af52acdea
commit
450d02d6e1
@ -380,7 +380,7 @@ def update(repo, node, branchmerge=False, force=False, partial=None,
|
|||||||
p1, p2 = p2, repo.changectx(nullid)
|
p1, p2 = p2, repo.changectx(nullid)
|
||||||
|
|
||||||
xp1, xp2 = str(p1), str(p2)
|
xp1, xp2 = str(p1), str(p2)
|
||||||
if p2.node() == nullid: xp2 = ''
|
if not p2: xp2 = ''
|
||||||
|
|
||||||
repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
|
repo.hook('preupdate', throw=True, parent1=xp1, parent2=xp2)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user