diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2024-05-05 14:41:21 +0200 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2025-05-23 17:04:23 -0400 |
| commit | dcda716dbc9c90bcac4611bd1076747671ee0906 (patch) | |
| tree | d30fcf5a06addb22c6273e98caeb71b53194738b | |
| parent | e25cbdf3576f07bda742a4f13d9380a815e43502 (diff) | |
| parent | 0730a5a3a5e69e4b5fa0fbf6edd7fcbd7a08c992 (diff) | |
| download | git-dcda716dbc9c90bcac4611bd1076747671ee0906.tar.gz | |
Merge branch 'ml/git-gui-exec-path-fix'
* ml/git-gui-exec-path-fix:
git-gui - use git-hook, honor core.hooksPath
git-gui - re-enable use of hook scripts
| -rwxr-xr-x | git-gui.sh | 29 |
1 files changed, 3 insertions, 26 deletions
diff --git a/git-gui.sh b/git-gui.sh index 8bc8892c40..3e5907a460 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -118,7 +118,7 @@ proc sanitize_command_line {command_line from_index} { set i $from_index while {$i < [llength $command_line]} { set cmd [lindex $command_line $i] - if {[file pathtype $cmd] ne "absolute"} { + if {[llength [file split $cmd]] < 2} { set fullpath [_which $cmd] if {$fullpath eq ""} { throw {NOT-FOUND} "$cmd not found in PATH" @@ -661,31 +661,8 @@ proc git_write {args} { } proc githook_read {hook_name args} { - set pchook [gitdir hooks $hook_name] - lappend args 2>@1 - - # On Windows [file executable] might lie so we need to ask - # the shell if the hook is executable. Yes that's annoying. - # - if {[is_Windows]} { - upvar #0 _sh interp - if {![info exists interp]} { - set interp [_which sh] - } - if {$interp eq {}} { - error "hook execution requires sh (not in PATH)" - } - - set scr {if test -x "$1";then exec "$@";fi} - set sh_c [list $interp -c $scr $interp $pchook] - return [_open_stdout_stderr [concat $sh_c $args]] - } - - if {[file executable $pchook]} { - return [_open_stdout_stderr [concat [list $pchook] $args]] - } - - return {} + set cmd [concat git hook run --ignore-missing $hook_name -- $args 2>@1] + return [_open_stdout_stderr $cmd] } proc kill_file_process {fd} { |