path: root/credential.h
diff options
authorbrian m. carlson <>2020-02-20 02:24:12 (GMT)
committerJunio C Hamano <>2020-02-20 21:05:43 (GMT)
commit82eb249853868582d8ba65e3afc5a7dcaeb620ea (patch)
treef7810f74a0f26aa183be36239edadbad5cf7b3ab /credential.h
parent588c70e10f3511f85110512da97b188f3c581e53 (diff)
credential: use the last matching username in the config
Everywhere else in the codebase, we use the rule that the last matching configuration option is the one that takes effect. This is helpful because it allows more specific configuration settings (e.g., per-repo configuration) to override less specific settings (e.g., per-user configuration). However, in the credential code, we didn't honor this setting, and instead picked the first setting we had, and stuck with it. This was likely to ensure we picked the value from the URL, which we want to honor over the configuration. It's possible to do both, though, so let's check if the value is the one we've gotten over our protocol connection, which if present will have come from the URL, and keep it if so. Otherwise, let's overwrite the value with the latest version we've got from the configuration, so we keep the last configuration value. Signed-off-by: brian m. carlson <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'credential.h')
1 files changed, 2 insertions, 1 deletions
diff --git a/credential.h b/credential.h
index 5772d50..fffed4d 100644
--- a/credential.h
+++ b/credential.h
@@ -208,7 +208,8 @@ struct credential {
unsigned approved:1,
- use_http_path:1;
+ use_http_path:1,
+ username_from_proto:1;
char *username;
char *password;