Skip to content

Commit 2c91d23

Browse files
authored
Merge branch 'master' into add-first-snapshot-tests-using-insta
2 parents 2a80442 + d68f366 commit 2c91d23

File tree

5 files changed

+17
-25
lines changed

5 files changed

+17
-25
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -303,26 +303,13 @@ jobs:
303303
name: Test Homebrew Formula (macOS)
304304
runs-on: macos-latest
305305
steps:
306-
- name: Checkout code
307-
uses: actions/checkout@v4
306+
- name: Set up Homebrew
307+
uses: Homebrew/actions/setup-homebrew@master
308308

309309
- name: Install stable Rust
310310
uses: actions-rs/toolchain@v1
311311
with:
312312
toolchain: stable
313313

314-
- name: Install Homebrew
315-
run: /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
316-
317-
- name: Set up Homebrew in PATH
318-
run: |
319-
echo "$HOMEBREW_PREFIX/bin:$HOMEBREW_PREFIX/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin" >> $GITHUB_PATH
320-
321-
- name: Update Homebrew
322-
run: brew update
323-
324314
- name: Let Homebrew build gitui from source
325-
run: brew install --head --build-from-source gitui
326-
327-
- name: Run Homebrew test
328-
run: brew test gitui
315+
run: brew install --build-from-source gitui

Cargo.lock

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,11 @@ These are the high level goals before calling out `1.0`:
8080

8181
* visualize branching structure in log tab ([#81](https://github.com/gitui-org/gitui/issues/81))
8282
* interactive rebase ([#32](https://github.com/gitui-org/gitui/issues/32))
83+
- no git-lfs support (see [#2812](https://github.com/gitui-org/gitui/issues/2812))
8384

8485
## 5. <a name="limitations"></a> Known Limitations <small><sup>[Top ▲](#table-of-contents)</sup></small>
8586

8687
- no sparse repo support (see [#1226](https://github.com/gitui-org/gitui/issues/1226))
87-
- no git-lfs support (see [#1089](https://github.com/gitui-org/gitui/discussions/1089))
8888
- *credential.helper* for https needs to be **explicitly** configured (see [#800](https://github.com/gitui-org/gitui/issues/800))
8989

9090
Currently, this tool does not fully substitute the _git shell_, however both tools work well in tandem.

assets/logo.svg

Lines changed: 1 addition & 0 deletions
Loading

asyncgit/src/sync/status.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,11 @@ pub fn get_status(
202202
let iter = status.into_index_worktree_iter(Vec::new())?;
203203

204204
for item in iter {
205-
let item = item?;
205+
let Ok(item) = item else {
206+
log::warn!("[status] the status iter returned an error for an item: {item:?}");
207+
208+
continue;
209+
};
206210

207211
let status = item.summary().map(Into::into);
208212

0 commit comments

Comments
 (0)