Skip to content

Commit 6f76001

Browse files
authored
Merge branch 'main' into ODP-5235
2 parents 3aa0291 + 481723b commit 6f76001

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/github/backup.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ impl GithubClient {
150150
let stderr = String::from_utf8_lossy(&s.stderr);
151151
eprintln!("Error while backing up.");
152152
eprintln!("STDERR:\n{stderr}");
153+
153154
let actual_commmand = if atomic {
154155
tmp_path.clone()
155156
} else {
@@ -165,9 +166,10 @@ impl GithubClient {
165166
// If the clone failed, remove the directory to avoid leaving a broken repo
166167
std::fs::remove_dir_all(tmp_directory)?;
167168
}
168-
Err(GitError::Other(format!(
169-
"Failed to back up repository: {ssh_url}, error: {e}"
170-
)))
169+
Err(GitError::ExecutionError {
170+
command: format!("git remote update -C {path}"),
171+
status: s.status.to_string(),
172+
})
171173
}
172174
}
173175
})

src/github/tag.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ impl GithubClient {
177177
other => return Err(GitError::Other(format!("Unknown tag type '{other}'"))),
178178
};
179179
let sha = tag.target.oid;
180+
180181
let commit_sha = tag.target.target.map(|inner| inner.oid);
181182

182183
if let Some(url) = parent_url.as_ref()

0 commit comments

Comments
 (0)