Skip to content
This repository was archived by the owner on Mar 31, 2025. It is now read-only.

Commit cf3df09

Browse files
KobzolMark-Simulacrum
authored andcommitted
Handle missing allow_auto_merge attribute on repositories
It can be missing if the repository is archived.
1 parent d9e876d commit cf3df09

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/github/api/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,8 @@ pub(crate) struct Repo {
258258
pub(crate) description: Option<String>,
259259
pub(crate) homepage: Option<String>,
260260
pub(crate) archived: bool,
261-
pub(crate) allow_auto_merge: bool,
261+
#[serde(default)]
262+
pub(crate) allow_auto_merge: Option<bool>,
262263
}
263264

264265
fn repo_owner<'de, D>(deserializer: D) -> Result<String, D::Error>

src/github/api/write.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ impl GitHubWrite {
236236
description: settings.description.clone(),
237237
homepage: settings.homepage.clone(),
238238
archived: false,
239-
allow_auto_merge: settings.auto_merge_enabled,
239+
allow_auto_merge: Some(settings.auto_merge_enabled),
240240
})
241241
} else {
242242
Ok(self

src/github/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ impl SyncGitHub {
261261
description: actual_repo.description.clone(),
262262
homepage: actual_repo.homepage.clone(),
263263
archived: actual_repo.archived,
264-
auto_merge_enabled: actual_repo.allow_auto_merge,
264+
auto_merge_enabled: actual_repo.allow_auto_merge.unwrap_or(false),
265265
};
266266
let new_settings = RepoSettings {
267267
description: Some(expected_repo.description.clone()),

0 commit comments

Comments
 (0)