git rebase-update && gclient sync fails repeatedly due to unstaged changes in src/WebKit

[Timo Reimann]

Hi,

I'm facing an issue I can't seem to be able to fix permanently: Each single time I run git rebase-update and gclient sync, the latter fails due to unstaged changes in WebKit:

$ gclient sync

Syncing projects:  25% (18/70) src/third_party/cld_2/src                       

src/third_party/WebKit (ERROR)

----------------------------------------

[0:00:03] Started.

----------------------------------------

Error: 13> 

13> ____ src/third_party/WebKit at 95f1fb093bff3df7ae69722655297dcec0827fc6

13> You have unstaged changes.

13> Please commit, stash, or reset.

The state in src/WebKit looks like this:

$ cd third_party/WebKit/

timo@localhost:WebKit ((b2ca305...))$ git status

HEAD detached at b2ca305

Changes not staged for commit:

  (use "git add/rm <file>..." to update what will be committed)

  (use "git checkout -- <file>..." to discard changes in working directory)

deleted:    LayoutTests/fast/images/resources/missing-plte-before-trns.png

no changes added to commit (use "git add" and/or "git commit -a")

I am able to fix the error git-wise and proceed with the synchronization. However, next time I rebase-update and gclient-sync again, the error returns, usually complaining about a different file (or set of files) being unstaged in WebKit. (It's always WebKit.)

I also tried removing src/WebKit completely and doing a full sync, but to no avail.

Grateful for any advice on how to make the update cycle finish smoothly.

Thanks

Timo

[Paweł Hajdan, Jr.]

+infra-dev

How did you create your checkout? Did you use "fetch chromium"? Could you try again making sure you have up to date depot_tools?

Paweł

--
--
Chromium Developers mailing list: chromi...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-dev

[Timo Reimann]

Yes, I used fetch a couple of months ago.

Can/should I re-run it over my existing checkout? Or should I do it from a clean, fresh directory?

[Andrey]

On Tuesday, August 25, 2015 at 11:26:11 PM UTC+3, Timo Reimann wrote:

Hi,

I'm facing an issue I can't seem to be able to fix permanently: Each single time I run git rebase-update and gclient sync, the latter fails due to unstaged changes in WebKit:

$ gclient sync

Syncing projects:  25% (18/70) src/third_party/cld_2/src                       

src/third_party/WebKit (ERROR)

----------------------------------------

[0:00:03] Started.

----------------------------------------

Error: 13> 

13> ____ src/third_party/WebKit at 95f1fb093bff3df7ae69722655297dcec0827fc6

13> You have unstaged changes.

13> Please commit, stash, or reset.

The state in src/WebKit looks like this:

$ cd third_party/WebKit/

timo@localhost:WebKit ((b2ca305...))$ git status

HEAD detached at b2ca305

Changes not staged for commit:

  (use "git add/rm <file>..." to update what will be committed)

  (use "git checkout -- <file>..." to discard changes in working directory)

deleted:    LayoutTests/fast/images/resources/missing-plte-before-trns.png

This file is deleted by antivirus because it triggers a png security vulnerability (this file is part of regression test suite). You need to either disable antivirus, exclude chrome folder from the scan or don't let it delete this file. Maybe you can also persuade the antivirus vendor to fix this false positive.

-- Andrey Khalyavin

[Timo Reimann]

AVS is probably the last thing I'd have considered as potential reason for the problem.

Appreciated, Andrey.