From d98171b2aab0fe7589c143ffec513bb8f90c2ecf Mon Sep 17 00:00:00 2001
From: Isaac Corbrey <icorbrey@gmail.com>
Date: Mon, 30 Sep 2024 05:18:24 -0400
Subject: [PATCH] Set `CREATE_NO_WINDOW` flag when executing Git hooks (#2371)

---
 CHANGELOG.md                |  1 +
 git2-hooks/src/hookspath.rs | 37 ++++++++++++++++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56167573ce..e89e1af6cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixes
 * respect env vars like `GIT_CONFIG_GLOBAL` ([#2298](https://github.com/extrawurst/gitui/issues/2298))
+* Set `CREATE_NO_WINDOW` flag when executing Git hooks on Windows ([#2371](https://github.com/extrawurst/gitui/pull/2371))
 
 ### Added
 * add popups for viewing, adding, updating and removing remotes [[@robin-thoene](https://github.com/robin-thoene)] ([#2172](https://github.com/extrawurst/gitui/issues/2172))
diff --git a/git2-hooks/src/hookspath.rs b/git2-hooks/src/hookspath.rs
index fe01386b4e..3648676ee2 100644
--- a/git2-hooks/src/hookspath.rs
+++ b/git2-hooks/src/hookspath.rs
@@ -3,7 +3,10 @@ use git2::Repository;
 use crate::{error::Result, HookResult, HooksError};
 
 use std::{
-	env, path::Path, path::PathBuf, process::Command, str::FromStr,
+	env,
+	path::{Path, PathBuf},
+	process::Command,
+	str::FromStr,
 };
 
 pub struct HookPaths {
@@ -118,6 +121,7 @@ impl HookPaths {
 			.unwrap_or_else(|| "bash".into());
 		let output = Command::new(git_shell)
 			.args(bash_args)
+			.with_no_window()
 			.current_dir(&self.pwd)
 			// This call forces Command to handle the Path environment correctly on windows,
 			// the specific env set here does not matter
@@ -197,3 +201,34 @@ fn find_bash_executable() -> Option<PathBuf> {
 fn find_default_unix_shell() -> Option<PathBuf> {
 	env::var_os("SHELL").map(PathBuf::from)
 }
+
+trait CommandExt {
+	/// The process is a console application that is being run without a
+	/// console window. Therefore, the console handle for the application is
+	/// not set.
+	///
+	/// This flag is ignored if the application is not a console application,
+	/// or if it used with either `CREATE_NEW_CONSOLE` or `DETACHED_PROCESS`.
+	///
+	/// See: <https://learn.microsoft.com/en-us/windows/win32/procthread/process-creation-flags>
+	const CREATE_NO_WINDOW: u32 = 0x0800_0000;
+
+	fn with_no_window(&mut self) -> &mut Self;
+}
+
+impl CommandExt for Command {
+	/// On Windows, CLI applications that aren't the window's subsystem will
+	/// create and show a console window that pops up next to the main
+	/// application window when run. We disable this behavior by setting the
+	/// `CREATE_NO_WINDOW` flag.
+	#[inline]
+	fn with_no_window(&mut self) -> &mut Self {
+		#[cfg(windows)]
+		{
+			use std::os::windows::process::CommandExt;
+			self.creation_flags(Self::CREATE_NO_WINDOW);
+		}
+
+		self
+	}
+}