bug#62093: 30.0.50; tramp: commit 8c6a463 breaks remotely staging chunks in magit

bug#62093: 30.0.50; tramp: commit 8c6a463 breaks remotely staging chunks in magit

[Benjamin Orthen]

Commit 8c6a4639318f09720cda295e6a93677153046d84 breaks remotely staging
chunks in magit, see https://github.com/magit/magit/issues/4720.

This commit added the options "-icanon min 1 time 0" for non-Darwin 
remote
hosts. Without this additional option, staging chunks works.

To reproduce:
- use tramp to visit a remote Linux host
- open magit on a git repository on the remote host
- in the magit buffer, try to stage a chunk (not a whole file)


In GNU Emacs 30.0.50 (build 1, x86_64-pc-linux-gnu, GTK+ Version
3.24.36, cairo version 1.16.0)
Repository revision: 5ff018524c740c77215ddb5d5983dbfcadb05599
Repository branch: master
System Description: Ubuntu 22.10

Configured using:
  'configure
  
--prefix=/nix/store/bsqwccil9xvz9gvnhgqyhp4vf074c1d9-emacs-pgtk-20230308.0
  --disable-build-details --with-modules --with-pgtk
  --with-native-compilation'

Configured features:
CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG JSON
LIBSELINUX LIBSYSTEMD LIBXML2 MODULES NATIVE_COMP NOTIFY INOTIFY PDUMPER
PGTK PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF TOOLKIT_SCROLL_BARS
TREE_SITTER WEBP XIM GTK3 ZLIB

Important settings:
   value of $EMACSLOADPATH: 
/nix/store/q5g9xjavpivmnr4j8qlbshzj4ix3sgbl-emacs-packages-deps/share/emacs/site-lisp:
   value of $EMACSNATIVELOADPATH: 
/nix/store/q5g9xjavpivmnr4j8qlbshzj4ix3sgbl-emacs-packages-deps/share/emacs/native-lisp::
   value of $LC_MONETARY: de_DE.UTF-8
   value of $LC_NUMERIC: de_DE.UTF-8
   value of $LC_TIME: de_DE.UTF-8
   value of $LANG: en_US.UTF-8
   value of $XMODIFIERS: @im=ibus
   locale-coding-system: utf-8

bug#62093: 30.0.50; tramp: commit 8c6a463 breaks remotely staging chunks in magit

[Michael Albinus]

Benjamin Orthen <benjamin@orthen.net> writes:

Hi Benjamin,

> To reproduce:
> - use tramp to visit a remote Linux host
> - open magit on a git repository on the remote host
> - in the magit buffer, try to stage a chunk (not a whole file)

I'm sorry, but I don't use magit myself. Could you please describe the
magit commands I have to apply in Emacs in order to reproduce?

Best regards, Michael.

bug#62093: 30.0.50; tramp: commit 8c6a463 breaks remotely staging chunks in magit

[Benjamin Orthen]

[-- Attachment #1: Type: text/plain, Size: 804 bytes --]

Hi Michael,

sure. You'll need a git repository on a remote host with unstaged 
changes.

In the git repository, execute:
- `magit-status`
- `magit-jump-to-unstaged`
- navigate the cursor to one unstaged chunk in the diff (see attached 
image as an example)
- `magit-stage`

I hope this helps for reproducing the issue.

Best,
Benjamin


Am 2023-03-25 17:37, schrieb Michael Albinus:
> Benjamin Orthen <benjamin@orthen.net> writes:
> 
> Hi Benjamin,
> 
>> To reproduce:
>> - use tramp to visit a remote Linux host
>> - open magit on a git repository on the remote host
>> - in the magit buffer, try to stage a chunk (not a whole file)
> 
> I'm sorry, but I don't use magit myself. Could you please describe the
> magit commands I have to apply in Emacs in order to reproduce?
> 
> Best regards, Michael.

[-- Attachment #2: Screenshot from 2023-04-04 11-08-54.png --]
[-- Type: image/png, Size: 25158 bytes --]

bug#62093: 30.0.50; tramp: commit 8c6a463 breaks remotely

[Marc Bowes]

[-- Attachment #1: Type: text/plain, Size: 576 bytes --]

I'm having the same experience as described. I downgraded this function
(see the instructions in the magit issue), and that fixed the problem for
me.

For what it's worth, on the remote host I see hung `git` processes for each
time I tried this and bailed with C-g. If I strace any one, it's stuck
reading stdin. (To see this, you need to use ControlMaster, otherwise the
process is reaped by the ssh parent ending.)

I think the hang is caused by magit sending a patch, followed by EOF and
then the process never ends, so magit waits forever, and the patch is never
applied.

[-- Attachment #2: Type: text/html, Size: 677 bytes --]