diff options
| author | Johannes Sixt <j6t@kdbg.org> | 2025-05-03 13:24:48 +0200 |
|---|---|---|
| committer | Taylor Blau <me@ttaylorr.com> | 2025-05-23 17:04:24 -0400 |
| commit | dc9ecb1aab1a3438fceeb44db67ddf8e8d938324 (patch) | |
| tree | bc04579d737471a9bccd119b91c2d0d599cc6de5 /lib/merge.tcl | |
| parent | 074c2b9d7c4b1201f261263f011074c733a85d38 (diff) | |
| download | git-dc9ecb1aab1a3438fceeb44db67ddf8e8d938324.tar.gz | |
git-gui: convert git_read*, git_write to be non-variadic
We are going to treat command arguments and redirections differently to
avoid passing arguments that look like redirections to the command
accidentally. To do so, it will be necessary to know which arguments
are intentional redirections. As a preparation, convert git_read,
git_read_nice, and git_write to take just a single argument that is
the command in a list. Adjust all call sites accordingly.
In the future, this argument will be the regular command arguments and
a second argument will be the redirection operations.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Diffstat (limited to 'lib/merge.tcl')
| -rw-r--r-- | lib/merge.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/merge.tcl b/lib/merge.tcl index e97c91eab6..6317c32127 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -239,7 +239,7 @@ Continue with resetting the current changes?"] } if {[ask_popup $op_question] eq {yes}} { - set fd [git_read read-tree --reset -u -v HEAD 2>@1] + set fd [git_read [list read-tree --reset -u -v HEAD 2>@1]] fconfigure $fd -blocking 0 -translation binary set status_bar_operation [$::main_status \ start \ |