From 349feb9d0268a0c4d2053c31197fd405b1aa7f6b Mon Sep 17 00:00:00 2001 From: Ian Butterworth Date: Sun, 10 Oct 2021 10:03:09 -0400 Subject: [PATCH] fix libgit2 error throw. Fixes #42575 (#42576) (cherry picked from commit 7a8a39bfe4b5a41703f235186e5c31fb071535d5) --- stdlib/LibGit2/src/rebase.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/LibGit2/src/rebase.jl b/stdlib/LibGit2/src/rebase.jl index 8151217b3950b..51b52ef006c38 100644 --- a/stdlib/LibGit2/src/rebase.jl +++ b/stdlib/LibGit2/src/rebase.jl @@ -83,7 +83,7 @@ function commit(rb::GitRebase, sig::GitSignature) oid_ptr, rb.ptr, C_NULL, sig.ptr, C_NULL, C_NULL) catch err # TODO: return current HEAD instead - err.code === Error.EAPPLIED && return nothing + err isa GitError && err.code === Error.EAPPLIED && return nothing rethrow() end return oid_ptr[]