gclient sync incorrectly thinks I have unstaged changes on windows

[Jered Wierzbicki]

Today, gclient sync on windows tells me:

Cannot rebase: You have unstaged changes.

Please commit or stash them.

and then hangs. But git status says there's nothing pending.

Any ideas?

[James Robinson]

I've hit this before with issues related to the .gitmodules file.  Try going through the steps here: https://code.google.com/p/chromium/wiki/UsingNewGit#Troubleshooting_tips_for_the_git_submodule_transition and see if any of them help.

- James

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

[Dirk Pranke]

It is also possible you have unstaged changes in depot_tools, not your main repo, since we automatically try to update depot_tools when we run gclient.

-- Dirk

[Jered Wierzbicki]

I think Dirk must be correct.

After displaying the original non-error message, gclient actually started syncing anyway in the background, and got partway through when I interrupted to attempt to deal with the apparent error message. This left my tree in an even worse state. After just waiting a long time, it appears to be working normally.

Thanks.

[m...@chromium.org]

Dirk,

I ran into the same problem on my windows machine with 'git status' showing bunch of files in depot_tools as modified.

Is it safe to ignore, or is there something that has to be done with this?

[Dirk Pranke]

If you don't know what the changes are, or how they got there, I'd probably get rid of them with git reset --hard HEAD.

-- Dirk