Merge lp:~cjwatson/brz/fix-loggerhead-git-option into lp:brz

Proposed by Colin Watson on 2020-11-13
Status: Merged
Approved by: Jelmer Vernooij on 2020-11-16
Approved revision: 7522
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~cjwatson/brz/fix-loggerhead-git-option
Merge into: lp:brz
Diff against target: 12 lines (+1/-1)
1 file modified
breezy/git/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~cjwatson/brz/fix-loggerhead-git-option
Reviewer Review Type Date Requested Status
Jelmer Vernooij 2020-11-13 Approve on 2020-11-16
Review via email: mp+393708@code.launchpad.net

Commit message

Fix handling of git.http option.

Description of the change

loggerhead_git_hook tested this option using a different spelling ('http_git') and the opposite sense from the documentation. Correct it to match the documentation, since it seems to make more sense for this to be opt-in, avoiding surprises such as that in https://bugs.launchpad.net/launchpad/+bug/1744830.

To post a comment you must log in.
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/git/__init__.py'
2--- breezy/git/__init__.py 2020-07-18 23:14:00 +0000
3+++ breezy/git/__init__.py 2020-11-13 11:08:52 +0000
4@@ -423,7 +423,7 @@
5 def loggerhead_git_hook(branch_app, environ):
6 branch = branch_app.branch
7 config_stack = branch.get_config_stack()
8- if config_stack.get('http_git'):
9+ if not config_stack.get('git.http'):
10 return None
11 from .server import git_http_hook
12 return git_http_hook(branch, environ['REQUEST_METHOD'],

Subscribers

People subscribed via source and target branches