Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/compile/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,10 @@ async fn compile_pipeline_inner(
// debug-level log when the output is not inside a git repository, since
// a non-git workspace is a valid use case (e.g. ad-hoc compilation).
// Skipped during batch compilation (callers do one sync at the end).
if sync_gitattributes {
if let Err(e) = sync_gitattributes_for_output(&yaml_output_path).await {
debug!("Skipped .gitattributes update: {}", e);
}
if sync_gitattributes
&& let Err(e) = sync_gitattributes_for_output(&yaml_output_path).await
{
debug!("Skipped .gitattributes update: {}", e);
}

Ok(rewrote)
Expand Down Expand Up @@ -490,7 +490,7 @@ pub async fn check_pipeline(pipeline_path: &str) -> Result<()> {
let header_meta = existing
.lines()
.take(5)
.find_map(|line| crate::detect::parse_header_line(line))
.find_map(crate::detect::parse_header_line)
.with_context(|| {
format!(
"No @ado-aw header found in {}. Is this file generated by ado-aw?",
Expand Down