I ran gclient with error "Cannot rebase: You have unstaged changes"

[John Alway]

Hello,

I wonder if anyone can help me with this!  :-)

I'm just now working on downloading and setting up the Chromium browser on Windows 7.   I downloaded depot_tools and unzipped them.

I then ran:

"gclient once"

I received the following error:

"Cannot rebase: You have unstaged changes"

This means it thinks I have modified something, when I have done nothing at all but attempt to install depot tools according to the instructions on the web, right here: http://dev.chromium.org/developers/how-tos/install-depot-tools

I'm not using Cygwin.

When I run "git status" it claims all kinds of files were modified, but that's certainly not my doing.   

I did have a thunderstorm last night that caused erratic connection and a freeze of gclient, so I had to delete everything, the depot_tools folder, and do everything over again.

Thanks for any help!!

Thanks,

...John

[Thiago Farina]

Check depot_tools out like this:

git clone https://chromium.googlesource.com/chromium/tools/depot_tools

Then try again the instructions.

--
Thiago

[Zachary Turner]

I had this problem once.  I had done literally nothing except checkout depot tools into a fresh working directory and run gclient.  I ran the following command:

git reset --hard HEAD

and it fixed everything.  This will reset both your working tree as well as your index back to a sane state.  All the work you've done will be destroyed, so use with caution.

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

[John Alway]

Thanks, Thiago.

I tried that, but got the same error!

...John

[John Alway]

Thanks, Zachary!

Since I've done no work yet and am only now looking at Chromium for the first time that should be no problem.    I ran that command and it took it.   Now, do I rerun "gclient once"?    Anyway, I did, and it didn't throw any errors, so maybe that worked!

...John

[Zachary Turner]

The command you run is not "gclient once".  It is "gclient".  And you do this once, as in one time.  I don't think that was the reason for the error you experienced, and perhaps "gclient once" is equivalent to "gclient" since "once" is an unrecognized argument.  I'm not sure how that will behave.  Run "gclient" just to be safe, and verify that that has no errors.  If that completes successfully, then you can proceed to the next step.