gclient sync failure by seeing a unstage directory probably auto generated by gclient sync

[Dean Liao]

I run gclient sync today and encounter failure:

deanliao:~/chrome/src ((df09cb0da5d9...))$ rm -rf components/resources/default_300_percent/google_chrome/

deanliao:~/chrome/src ((df09cb0da5d9...))$ gclient sync

Syncing projects:  92% (162/176) src/remoting/test/internal

src/chrome/app/vector_icons/google_chrome (ERROR)

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

[0:00:23] Started.

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

Error: 116>

116> ____ src/chrome/app/vector_icons/google_chrome at b94afcb982f8c904a1ba9544fb1254502808331d

116>    You have unstaged changes.

116>    Please commit, stash, or reset.

deanliao:~/chrome/src ((df09cb0da5d9...))$ git status

HEAD detached from f356df5d4dee

Untracked files:

  (use "git add <file>..." to include in what will be committed)

        components/resources/default_300_percent/google_chrome/

nothing added to commit but untracked files present (use "git add" to track)

Could it related to recent changes regarding https://bugs.chromium.org/p/chromium/issues/detail?id=944754 ?

[Jochen Eisinger]

I suspect you have some changes in chrome/app/vector_icons/google_chrome - can you cd into that directory and use git status?

--
--
Chromium Developers mailing list: chromi...@chromium.org
View archives, change email options, or unsubscribe:
http://groups.google.com/a/chromium.org/group/chromium-dev
---
You received this message because you are subscribed to the Google Groups "Chromium-dev" group.
To view this discussion on the web visit https://groups.google.com/a/chromium.org/d/msgid/chromium-dev/6363f862-acd2-48d5-98c6-b0ea86728ae7%40chromium.org.

[Stephen Chenney]

I hit it too.

For some reason 3 files were deleted locally.

> cd chrome/app/vector_icons/google_chrome

> git status

HEAD detached at b94afcb

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:    google_g_logo.icon

deleted:    google_pay_logo.icon

deleted:    product.icon

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

> git checkout -- google_g_logo.icon google_pay_logo.icon product.icon

That fixed it.

Stephen.

To view this discussion on the web visit https://groups.google.com/a/chromium.org/d/msgid/chromium-dev/CALjhuidOnN6-KHkYBe93xcRMzP7chpq5h%2B7shL-wXt14ZcSKHg%40mail.gmail.com.

[Shuo-Peng Liao (廖碩鵬)]

I tried it again and encounter the same error Stephen encountered. Using "git checkout" to pull back the deleted file works.

However, it must have some underlying thing went wrong to make gclient sync unhappy (some hook deletes files or adds untracked files?) I suspect it is related to task that moving google icon from public to private repository. Please take a deeper look. I wonder if it hinders Chrome bisector's work.

--

Best Regards,

Dean