diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2025-05-03 19:21:53 +0200 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2025-05-23 17:04:23 -0400 |
| commit | 074c2b9d7c4b1201f261263f011074c733a85d38 (patch) | |
| tree | 039cfa3aee6035af75f48bd9edc9617f1a61bdc5 | |
| parent | aa42e87ef4ee9d84bd2fdb5e56de2ac2b61575d9 (diff) | |
| download | git-074c2b9d7c4b1201f261263f011074c733a85d38.tar.xz | |
git-gui: use git_read in githook_read
0730a5a3a5e6 ("git-gui - use git-hook, honor core.hooksPath", 2023-09-17)
rewrote githook_read to use `git hook` to run a hook script. The code
that was replaced discovered the hook script file manually and invoked
it using function _open_stdout_stderr. After the rewrite, this function
is still invoked, but it calls into `git` instead of the hook scripts.
Notice though, that we have function git_read that invokes git and
prepares a pipe for the caller to read from. Replace the implementation
of githook_read to be just a wrapper around git_read. This unifies the
way in which the git executable is invoked. git_read ultimately also
calls into _open_stdout_stderr, but it modifies the path to the git
executable before doing so.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
| -rwxr-xr-x | git-gui.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/git-gui.sh b/git-gui.sh index 28113220af..e10bf2a039 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -669,8 +669,7 @@ proc git_write {args} { } proc githook_read {hook_name args} { - set cmd [concat git hook run --ignore-missing $hook_name -- $args 2>@1] - return [_open_stdout_stderr $cmd] + git_read hook run --ignore-missing $hook_name -- $args 2>@1 } proc kill_file_process {fd} { |