Note that there are some explanatory texts on larger screens.

plurals
  1. POGit discard changes in working directory submodule
    text
    copied!<p>I am working in a submodule and am having trouble untracking a folder full of files </p> <pre><code>$ git status # On branch master # Changes not staged for commit: # (use "git add &lt;file&gt;..." to update what will be committed) # (use "git checkout -- &lt;file&gt;..." to discard changes in working directory) # # modified: public/javascripts/app/fckeditor/editor/skins/office2003/fck_dialog.css # modified: public/javascripts/app/fckeditor/editor/skins/office2003/fck_editor.css # modified: public/javascripts/app/fckeditor/editor/skins/silver/fck_dialog.css # modified: public/javascripts/app/fckeditor/editor/skins/silver/fck_editor.css # modified: public/javascripts/app/fckeditor/fckconfig.js # modified: public/javascripts/app/fckeditor/fckeditor.js # modified: public/javascripts/app/fckeditor/fckpackager.xml </code></pre> <p>I type</p> <pre><code>git reset --hard </code></pre> <p>which returns</p> <blockquote> <p>HEAD is now at b2c5a77 nothing</p> </blockquote> <p>However when I type </p> <pre><code>git status </code></pre> <p>I am again greeted with the long list of files. I have tried to </p> <pre><code>git clean -f </code></pre> <p>and also removed the entire submodule and checked out from the master server. I have also tried to delete the entire project whom the submodule belongs to, pulled that and then initiated and updated the submodule but to no avail.</p> <pre><code>rm -rf project git clone foo@bar.project.net:/home/rails/repo/gits/project.com #Cloning into project... #remote: Counting objects: 2452, done. #remote: Compressing objects: 100% (2040/2040), done. #remote: Total 2452 (delta 1238), reused 582 (delta 145) #Receiving objects: 100% (2452/2452), 561.32 KiB | 438 KiB/s, done. #Resolving deltas: 100% (1238/1238), done. cd project.com git submodule init git submodule update #Cloning into vendor/plugins/project_engine... cd vendor/plugins/project_engine $ git status # On branch master # Changes not staged for commit: # (use "git add &lt;file&gt;..." to update what will be committed) # (use "git checkout -- &lt;file&gt;..." to discard changes in working directory) # # modified: public/javascripts/app/fckeditor/editor/skins/office2003/fck_dialog.css # modified: public/javascripts/app/fckeditor/editor/skins/office2003/fck_editor.css # modified: public/javascripts/app/fckeditor/editor/skins/silver/fck_dialog.css # modified: public/javascripts/app/fckeditor/editor/skins/silver/fck_editor.css # modified: public/javascripts/app/fckeditor/fckconfig.js # modified: public/javascripts/app/fckeditor/fckeditor.js # modified: public/javascripts/app/fckeditor/fckpackager.xml </code></pre> <p>The only thing that seems to remove the files is if I log on as another use on my Mac, which makes me think its a problem my local machine and not the repo itself.</p> <p>I have also tried to uninstall and reinstall GIT and am currently running 1.7.5.4 install and complied with the help of brew (Ruby package manger).</p> <p>How do I remove these files from git status?</p>
 

Querying!

 
Guidance

SQuiL has stopped working due to an internal error.

If you are curious you may find further information in the browser console, which is accessible through the devtools (F12).

Reload