From 795b32efd7b107c657b8fccfe935cb19b01b9255 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Thu, 4 Aug 2022 16:23:52 +0530
Subject: [PATCH] Bash integration: Fix the inherit_errexit option being set by
 shell integration

Fixes #5349
---
 docs/changelog.rst                | 2 ++
 shell-integration/bash/kitty.bash | 1 +
 2 files changed, 3 insertions(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 5015efc30..4546113af 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -79,6 +79,8 @@ Detailed list of changes
 
 - Bash integration: Fix declare not creating global variables in .bashrc (:iss:`5254`)
 
+- Bash integration: Fix the inherit_errexit option being set by shell integration (:iss:`5349`)
+
 - :command:`kitty @ scroll-window` allow scrolling by fractions of a screen
   (:iss:`5294`)
 
diff --git a/shell-integration/bash/kitty.bash b/shell-integration/bash/kitty.bash
index cd600ad55..498dd8b46 100644
--- a/shell-integration/bash/kitty.bash
+++ b/shell-integration/bash/kitty.bash
@@ -23,6 +23,7 @@ if [[ -n "$KITTY_BASH_INJECT" ]]; then
         }
     else
         builtin set +o posix
+        builtin shopt -u inherit_errexit  # resetting posix does not clear this
         if [[ -n "$KITTY_BASH_UNEXPORT_HISTFILE" ]]; then
             builtin export -n HISTFILE
             builtin unset KITTY_BASH_UNEXPORT_HISTFILE