Commit 9d2a06c9 authored by Dan Villiom Podlaski Christiansen's avatar Dan Villiom Podlaski Christiansen
Browse files

branch_bookmark_suffix: change default from None, so that we needn't check

parent 4399eeb7ffc7
Pipeline #46928 passed with stages
in 14 minutes and 36 seconds
......@@ -7,7 +7,7 @@
CONFIG_DEFAULTS = {
b'git': {
b'authors': None,
b'branch_bookmark_suffix': None,
b'branch_bookmark_suffix': b'',
b'debugextrainmessage': False, # test only -- do not document this!
b'findcopiesharder': False,
b'intree': None,
......
......@@ -423,7 +423,7 @@
activate = None
if activate is not None:
activate += self.branch_bookmark_suffix or b''
activate += self.branch_bookmark_suffix
if activate in self.repo._bookmarks:
bookmarks.activate(self.repo, activate)
......@@ -1864,7 +1864,7 @@
for ref_name, wanted_node in self._get_ref_nodes(
remote_names, refs
).items():
bm = ref_name + (self.branch_bookmark_suffix or b'')
bm = ref_name + self.branch_bookmark_suffix
current_node = bms.get(bm)
if current_node is not None and current_node == wanted_node:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment