Staging chunk in file discards previous staged chunks

[jakub-gonet]

Issue Type: Bug

1. click green/blue/red block on line and stage it by + sign
2. click other line block to stage it
3. first staged chunk is discarded

VS Code version: Code - OSS 1.30.0 (610918d, 2018-11-18T15:05:55.294Z)
OS version: Linux x64 4.9.135-1-MANJARO

System Info

Item	Value
CPUs	Intel(R) Core(TM) i5-4210H CPU @ 2.90GHz (4 x 3441)
GPU Status	2d_canvas: enabled checker_imaging: disabled_off flash_3d: enabled flash_stage3d: enabled flash_stage3d_baseline: enabled gpu_compositing: enabled multiple_raster_threads: enabled_on native_gpu_memory_buffers: disabled_software rasterization: disabled_software video_decode: unavailable_software video_encode: unavailable_software webgl: enabled webgl2: enabled
Load (avg)	7, 7, 8
Memory (System)	7.71GB (1.06GB free)
Process Argv
Screen Reader	no
VM	0%

Extensions: none

[vscodebot]

(Experimental duplicate detection)
Thanks for submitting this issue. Please also check if it is already covered by an existing one, like:

• SCM: Change the focus to the next file after staging a file (#15112)
• Can't stage empty removed last line (#59670)
• Git: Support line staging (#9475)
• Staging is buggy when working on repository subfolder (#53652)
• Stage empty last line removal when using stage line cmd (#59974)

[joaomoreno]

Can you show me a screen recording of the issue?

[jakub-gonet]

Sure:
https://youtu.be/2VJan4dRdFM

As you may see, I started with clean document, but VSC showed that one line was modified (was modified earlier, as it took me 2 attemps to record this, but I removed modifications by using git). Aside from that non existent modif, VSC is clearly swapping between two staged versions. One line was added to staging and then the second should be added, but it swapped the staged versions.

[joaomoreno]

I started with clean document, but VSC showed that one line was modified

OK that is weird. That sounds like it's the actual issue, not your original description.

So, does VS Code not react to git repo events?

[jakub-gonet]

Hard to tell actually, because commits are updated. I'll check if reopening a file forces VSCode to record all new operations on repo.

I'm kinda suprised that nobody earlier spotted this issue, staging different things directly from VS seems to be quite popular workflow.

EDIT: Yup, reloading the file fixes this.

[joaomoreno]

I'm kinda suprised that nobody earlier spotted this issue, staging different things directly from VS seems to be quite popular workflow.

I can't reproduce it, I bet most people can't.

Yup, reloading the file fixes this.

You mean, closing and opening it?

---

Then, how easy is it for you to hit the issue?

[jakub-gonet]

Yep, reopening fixes that visual bug.

As it's happening to every file in every repo, quite easy.

I'll try deleting all local files and unistalling VS Code, maybe it won't occur in clean install.

[joaomoreno]

If you want to simulate a clean install simply run with code --user-data-dir DIR and pick a new folder for the user data dir.

[jakub-gonet]

Nope, switching folders and even reinstalling didn't help at all.

[joaomoreno]

/duplicate #64027

[vscodebot]

Thanks for creating this issue! We figured it's covering the same as another one we already have. Thus, we closed this one as a duplicate. You can search for existing issues here. See also our issue reporting guidelines.

Happy Coding!