In git-gui I cannot stage hunks of files added with 'git add --intent-to-add' anymore since 2.28 #2779

pascalmuller · 2020-08-03T15:38:08Z

I was not able to find an open or closed issue matching what I'm seeing

Setup

Which version of Git for Windows are you using? Is it 32-bit or 64-bit?

$ git --version --build-options

git version 2.28.0.windows.1
cpu: x86_64
built from commit: 77982caf269b7ee713a76da2bcf260c34d3bf7a7
sizeof-long: 4
sizeof-size_t: 8
shell-path: /bin/sh

Which version of Windows are you running? Vista, 7, 8, 10? Is it 32-bit or 64-bit?

$ cmd.exe /c ver

Microsoft Windows [Version 10.0.18363.959]

What options did you set as part of the installation? Or did you choose the
defaults?

# One of the following:
> type "C:\Program Files\Git\etc\install-options.txt"
> type "C:\Program Files (x86)\Git\etc\install-options.txt"
> type "%USERPROFILE%\AppData\Local\Programs\Git\etc\install-options.txt"
$ cat /etc/install-options.txt

Editor Option: VIM
Custom Editor Path:
Path Option: Cmd
SSH Option: OpenSSH
Tortoise Option: false
CURL Option: WinSSL
CRLF Option: CRLFAlways
Bash Terminal Option: MinTTY
Git Pull Behavior Option: Merge
Use Credential Manager: Enabled
Performance Tweaks FSCache: Enabled
Enable Symlinks: Disabled
Enable Pseudo Console Support: Disabled

Any other interesting things about your environment that might be related
to the issue you're seeing?

NO

Details

Which terminal/shell are you running Git from? e.g Bash/CMD/PowerShell/other

Bash

What commands did you run to trigger this issue? If you can provide a
Minimal, Complete, and Verifiable example
this will help us understand the issue.

$ echo "test" > text.txt
$ git add -N text.txt
$ git gui
I then try to stage the hunk or a line in the test.txt file in git gui using the right click menu.

What did you expect to occur after running these commands?

I expected that I could add a hunk or line in the new file, instead nothing happens after clicking one of these options in the context menu. To make sure you understand me, I added a screenshot of the context menu in question:

What actually happened instead?

The hunk can not be added through the GUI. (nothing happens after clicking this option in the right click menu) Also note that the terminal prints the following errors as well while starting git gui:

error: no icon for .vpane.files.workdir.list state={A} text.txt
error: no desc for state={AA} text.txt

I downgraded to 2.27.0 to validate if the recent upgrade broke this. In 2.27.0 everything works fine! No error is printed when starting git gui and i can add a hunk or line using the right click menu.

If the problem was occurring with a specific repository, can you provide the
URL to that repository to help us with testing?

I can replicate this problems in multiple repositories.

The text was updated successfully, but these errors were encountered:

dscho · 2020-08-11T14:34:58Z

This might be related to https://lore.kernel.org/git/20200808074959.35943-1-ray@ameretat.dev/. Would you be able to build Git from scratch? If so, you could test whether merging the rp/ita-diff-modefix branch from https://github.com/gitster/git fixes the issue (and in that case, you could open a PR and we'd get that fix really quickly).

pascalmuller · 2020-08-12T11:25:33Z

@dscho I have never built Git before, but I decided to give it a shot.

Unfortunately, it does not seem to solve the bug described here.

Just to be certain I did this correctly; these are the steps I've done.

** INSTALL GIT SDK
$ sdk cd git
$ git checkout -b test
$ git fetch https://github.com/gitster/git.git rp/ita-diff-modefix
$ git merge FETCH_HEAD
$ make install
** RUN STEPS TO REPRODUCE in another directory, as outlined in ticket

To be certain I was using the version of Git I built, I added an extra line of output to git status and repeated the steps. As I saw my change, I am quite certain the steps above have worked; but the merge of rp/ita-diff-modefix did not solve the issue.

dscho · 2020-08-12T13:47:37Z

Thanks for testing! And: bummer that it did not fix it. Let me give it a whirl.

dscho · 2020-08-12T14:57:09Z

Oh my. I totally wrote the wrong branch name: rp/apply-cached-with-i-t-a is the one I actually meant.

But even then, things don't work, there need to be a couple fixes in Git GUI's code itself.

As of Git v2.28.0, the diff for files staged via `git add -N` marks them as new files. Git GUI was ill-prepared for that, and this patch teaches Git GUI about them. Please note that this will not even fix things with v2.28.0, as the `rp/apply-cached-with-i-t-a` patches are required on Git's side, too. This fixes git-for-windows/git#2779 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

dscho · 2020-08-12T15:05:06Z

I have a tentative fix that I just submitted to the Git mailing list for review: gitgitgadget#699

pascalmuller · 2020-08-12T15:25:38Z

Happy I could help a little bit; thanks for looking into it so quickly!

Hope it'll be fixed soon.

dscho · 2020-10-18T21:49:16Z

@pascalmuller As I merged this, there will hopefully soon be a new snapshot for you to test. It would be good if you could verify that it works (ideally within the next 24h, i.e. before v2.29.0 is due).

dscho · 2020-10-18T21:51:27Z

(FWIW the installer and friends are being built right now and this Release Pipeline should then automatically upload the snapshot, in case you are interested to see the progress.)

pascalmuller · 2020-10-19T07:41:36Z

@dscho I verified that the scenario I described in this ticket is working in the latest snapshot. I'm really happy that this is working again, thanks for your efforts and those of everyone involved.

dscho · 2020-10-19T09:31:55Z

Excellent, thank you!!!

As of Git v2.28.0, the diff for files staged via `git add -N` marks them as new files. Git GUI was ill-prepared for that, and this patch teaches Git GUI about them. Please note that this will not even fix things with v2.28.0, as the `rp/apply-cached-with-i-t-a` patches are required on Git's side, too. This fixes git-for-windows#2779 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>

As of Git v2.28.0, the diff for files staged via `git add -N` marks them as new files. Git GUI was ill-prepared for that, and this patch teaches Git GUI about them. Please note that this will not even fix things with v2.28.0, as the `rp/apply-cached-with-i-t-a` patches are required on Git's side, too. This fixes #2779 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>

As of Git v2.28.0, the diff for files staged via `git add -N` marks them as new files. Git GUI was ill-prepared for that, and this patch teaches Git GUI about them. Please note that this will not even fix things with v2.28.0, as the `rp/apply-cached-with-i-t-a` patches are required on Git's side, too. This fixes git-for-windows#2779 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>

As of Git v2.28.0, the diff for files staged via `git add -N` marks them as new files. Git GUI was ill-prepared for that, and this patch teaches Git GUI about them. Please note that this will not even fix things with v2.28.0, as the `rp/apply-cached-with-i-t-a` patches are required on Git's side, too. This fixes #2779 Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>

weekly-digest bot mentioned this issue Aug 9, 2020

Weekly Digest (2 August, 2020 - 9 August, 2020) #2782

Closed

dscho mentioned this issue Aug 12, 2020

git-gui: accommodate for intent-to-add files gitgitgadget/git#699

Closed

dscho self-assigned this Aug 12, 2020

dscho added this to the Next release milestone Aug 12, 2020

dscho closed this as completed in 41589cc Oct 18, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

In git-gui I cannot stage hunks of files added with 'git add --intent-to-add' anymore since 2.28 #2779

In git-gui I cannot stage hunks of files added with 'git add --intent-to-add' anymore since 2.28 #2779

pascalmuller commented Aug 3, 2020 •

edited

Loading

dscho commented Aug 11, 2020

pascalmuller commented Aug 12, 2020 •

edited

Loading

dscho commented Aug 12, 2020

dscho commented Aug 12, 2020

dscho commented Aug 12, 2020

pascalmuller commented Aug 12, 2020

dscho commented Oct 18, 2020

dscho commented Oct 18, 2020

pascalmuller commented Oct 19, 2020

dscho commented Oct 19, 2020

In git-gui I cannot stage hunks of files added with 'git add --intent-to-add' anymore since 2.28 #2779

In git-gui I cannot stage hunks of files added with 'git add --intent-to-add' anymore since 2.28 #2779

Comments

pascalmuller commented Aug 3, 2020 • edited Loading

Setup

Details

dscho commented Aug 11, 2020

pascalmuller commented Aug 12, 2020 • edited Loading

dscho commented Aug 12, 2020

dscho commented Aug 12, 2020

dscho commented Aug 12, 2020

pascalmuller commented Aug 12, 2020

dscho commented Oct 18, 2020

dscho commented Oct 18, 2020

pascalmuller commented Oct 19, 2020

dscho commented Oct 19, 2020

pascalmuller commented Aug 3, 2020 •

edited

Loading

pascalmuller commented Aug 12, 2020 •

edited

Loading