Skip to content

Commit 04753e8

Browse files
committed
Merge branch 'develop'
2 parents a08a8d2 + 5811476 commit 04753e8

File tree

3 files changed

+52
-57
lines changed

3 files changed

+52
-57
lines changed

Cargo.lock

Lines changed: 43 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "git-repo-manager"
3-
version = "0.7.7"
3+
version = "0.7.8"
44
edition = "2021"
55

66
authors = [
@@ -44,7 +44,7 @@ path = "src/grm/main.rs"
4444
version = "=0.5.9"
4545

4646
[dependencies.serde]
47-
version = "=1.0.144"
47+
version = "=1.0.145"
4848
features = ["derive"]
4949

5050
[dependencies.git2]
@@ -54,7 +54,7 @@ version = "=0.15.0"
5454
version = "=2.1.2"
5555

5656
[dependencies.clap]
57-
version = "=3.2.18"
57+
version = "=3.2.22"
5858
features = ["derive", "cargo"]
5959

6060
[dependencies.console]
@@ -67,7 +67,7 @@ version = "=1.6.0"
6767
version = "=6.1.0"
6868

6969
[dependencies.serde_yaml]
70-
version = "=0.9.10"
70+
version = "=0.9.13"
7171

7272
[dependencies.serde_json]
7373
version = "=1.0.85"

src/table.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,11 @@ pub fn get_status_table(config: config::Config) -> Result<(Vec<Table>, Vec<Strin
185185
}
186186
};
187187

188-
add_repo_status(&mut table, &repo.name, &repo_handle, repo.worktree_setup)?;
188+
if let Err(err) =
189+
add_repo_status(&mut table, &repo.name, &repo_handle, repo.worktree_setup)
190+
{
191+
errors.push(format!("{}: Couldn't add repo status: {}", &repo.name, err));
192+
}
189193
}
190194

191195
tables.push(table);

0 commit comments

Comments
 (0)