Skip to content
Snippets Groups Projects
Commit 96f8baddbd6a authored by Pierre-Yves David's avatar Pierre-Yves David
Browse files

destutil: consistently retrieve 'p1' and 'branch'

We already read p1 from the dirstate so let's read the branch from it too.
parent 7d852bb47b0a
No related branches found
No related tags found
No related merge requests found
......@@ -194,7 +194,7 @@
"""find merge destination based on branch heads"""
node = None
parent = repo.dirstate.p1()
branch = repo[None].branch()
branch = repo.dirstate.branch()
bheads = repo.branchheads(branch)
nbhs = [bh for bh in bheads if not repo[bh].bookmarks()]
......
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