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

Proposed by Colin Watson
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
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 Approve
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.
Revision history for this message
Jelmer Vernooij (jelmer) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'breezy/git/__init__.py'
--- breezy/git/__init__.py 2020-07-18 23:14:00 +0000
+++ breezy/git/__init__.py 2020-11-13 11:08:52 +0000
@@ -423,7 +423,7 @@
423def loggerhead_git_hook(branch_app, environ):423def loggerhead_git_hook(branch_app, environ):
424 branch = branch_app.branch424 branch = branch_app.branch
425 config_stack = branch.get_config_stack()425 config_stack = branch.get_config_stack()
426 if config_stack.get('http_git'):426 if not config_stack.get('git.http'):
427 return None427 return None
428 from .server import git_http_hook428 from .server import git_http_hook
429 return git_http_hook(branch, environ['REQUEST_METHOD'],429 return git_http_hook(branch, environ['REQUEST_METHOD'],

Subscribers

People subscribed via source and target branches