Skip to content

Commit

Permalink
Fix logic that skips unknown object types (BloopAI#562)
Browse files Browse the repository at this point in the history
* Bump flake

* Only _skip_ unrecognized kinds
  • Loading branch information
rsdy committed May 24, 2023
1 parent 4eff9cc commit a1b2af6
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 9 deletions.
6 changes: 3 additions & 3 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@
};

runtimeDeps =
with pkgs; ([ openssl_1_1.out rocksdb git zlib ]);
with pkgs; ([ openssl.out rocksdb git zlib ]);

buildDeps = with pkgs;
([
stdenv.cc.cc.lib
glib.dev
pkg-config
openssl_1_1.out
openssl_1_1.dev
openssl.out
openssl.dev

protobuf
onnxruntime-static
Expand Down Expand Up @@ -62,8 +62,8 @@
LIBCLANG_PATH = "${libclang.lib}/lib";
ROCKSDB_LIB_DIR = "${pkgs.rocksdb}/lib";
ROCKSDB_INCLUDE_DIR = "${pkgs.rocksdb}/include";
OPENSSL_LIB_DIR = "${pkgs.openssl_1_1.out}/lib";
OPENSSL_INCLUDE_DIR = "${pkgs.openssl_1_1.dev}/include";
OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib";
OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include";
OPENSSL_NO_VENDOR = "1";
ORT_LIB_LOCATION = "${onnxruntime-static}/build";
};
Expand Down Expand Up @@ -129,7 +129,7 @@

devShell = (pkgs.mkShell {
buildInputs = buildDeps ++ runtimeDeps ++ guiDeps
++ (with pkgs; [ git-lfs cargo rustc rustfmt clippy ]);
++ (with pkgs; [ git-lfs cargo rustc rustfmt clippy rust-analyzer ]);
}).overrideAttrs (old: envVars);

});
Expand Down
4 changes: 4 additions & 0 deletions server/bleep/src/repo/iterator/git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ impl FileSource for GitWalker {
return None;
}

if matches!(kind, FileType::Other) {
return None;
}

let buffer = String::from_utf8_lossy(&object.data).to_string();

Some(RepoFile {
Expand Down

0 comments on commit a1b2af6

Please sign in to comment.