18

A developer added an image directory on the server without adding that folder to the .gitignore file. When I did a git pull it pulled those files (hundreds of files). I added the folder to the .gitignore on the server but not my local system. I then deleted the files locally (permanently). When I do a git status all those deleted files still show up. How can I suppress them from showing up?

Update: thanks for all the great help. To make sure there is no misunderstanding: I do want to keep the files on the server; I just want to remove them from git.

Adalex3
  • 400
  • 4
  • 14
uwe
  • 3,938
  • 11
  • 37
  • 50
  • So you want them permanently removed from the history of the repo while leaving the untracked files in your working directory? – Andy Nov 10 '11 at 21:52
  • Look at the Github link in my answer below. – Andy Nov 10 '11 at 22:09

7 Answers7

29

I find this to be the easiest way of doing the task.

$> git add -u <directory-path>   (or you may use --update)

Original State :

$> git status .

On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)
deleted:    .ipynb_checkpoints/Untitled-checkpoint.ipynb
deleted:    CVPR 1 hr tute-Backup.ipynb
deleted:    cifar10-test.t7
deleted:    cifar10-train.t7
deleted:    cifar10torchsmall.zip
deleted:    create_advr.lua
deleted:    criterion_cifar10_lr_0.001_epoch_13.t7
deleted:    train_cifar10.lua
deleted:    trained_net_cifar10_lr_0.001_epoch_13.t7

So, to remove all deleted files from my current directory, I use.

$> git add -u .
$> git commit -m "removing deleted files from tracking"
$> git push origin master

Final State :

$> git status .

On branch master
nothing to commit, working directory clean

Hope this helps :)

NightFury13
  • 761
  • 7
  • 19
  • what is the difference between this method and using `git rm`? – ocean800 Jul 17 '17 at 23:58
  • I don't see any difference in the output so I think you may use what ever suits you best (someone please correct me if I'm wrong). `git add` also adds the deleted files to tracking, just like `git rm`. – NightFury13 Jul 21 '17 at 11:16
  • @ocean800 @NightFury13 Using `git add -u .` you don't have to specify the names of all the files you want to delete. – mmai Sep 21 '20 at 09:44
15

You probably need to git rm the deleted files. From Pro Git:

Removing Files

To remove a file from Git, you have to remove it from your tracked files (more accurately, remove it from your staging area) and then commit. The git rm command does that and also removes the file from your working directory so you don’t see it as an untracked file next time around.

If you simply remove the file from your working directory, it shows up under the “Changed but not updated” (that is, unstaged) area of your git status output:

$ rm grit.gemspec
$ git status
# On branch master
#
# Changed but not updated:
#   (use "git add/rm <file>..." to update what will be committed)
#
#       deleted:    grit.gemspec
#

Then, if you run git rm, it stages the file’s removal:

$ git rm grit.gemspec
rm 'grit.gemspec'
$ git status
# On branch master
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#       deleted:    grit.gemspec
#

The next time you commit, the file will be gone and no longer tracked. If you modified the file and added it to the index already, you must force the removal with the -f option. This is a safety feature to prevent accidental removal of data that hasn’t yet been recorded in a snapshot and that can’t be recovered from Git.

Matt Ball
  • 354,903
  • 100
  • 647
  • 710
  • thanks! So when you commit the changes it won't remove the file from the remote repository, right? – uwe Nov 10 '11 at 20:41
  • @mototribe Look at my answer for what you will need to do to permanently remove the files from the history of the repository. – Andy Nov 10 '11 at 20:45
6

Updated after your comments.

If you want to keep the images on the server, but remove the files from git then you need to add the --cached flag to git rm.

cd images
git rm --cached *
cd ..
echo "images" > .gitignore
git add .
git commit -m "removed image files from git only"
git push

if you want people to create the images directory when they pull (but have no files), then add a images/.gitignore with the single line !.gitignore

Note, this won't remove them from the history. For that, i would look at this SO answer

Community
  • 1
  • 1
Mark Fisher
  • 9,838
  • 3
  • 32
  • 38
  • sorry, I wasn't clear, I want to keep the files on the server, just remove them from the git tracking – uwe Nov 10 '11 at 22:04
4

Since they've already been committed to the repository it's a bit more work, but still doable.

The best walkthrough that I've found on this procedure is Github's guide on Removing Sensitive Data. Since you want to keep the files, you have a step to do before and after the guide.

Before you start this process, copy the files out of your working directory. Once you have finished purging the repo of them, copy them back in and add them to your .gitignore.

Andy
  • 44,610
  • 13
  • 70
  • 69
  • couldn't I just copy my directory with all the files, then do a git rm images/*, git commit, git push? Then I copy the directory back. – uwe Nov 10 '11 at 22:34
  • If you do that, images/* will remain in your history. You will need to go back and edit the commits that introduced them. Otherwise the repository will still have the files, they just won't be in version after you deleted them. – Andy Nov 10 '11 at 22:42
  • "history" as in the git log? all I want to do is prevent the files from showing up in the "Changes not staged for commit:" list when I do a "git status". Thanks for all the help! – uwe Nov 10 '11 at 23:48
  • 2
    By history, I meant that everyone who clones that repo is going to clone all of those files, if they are not removed from the history. Although they are not currently in your working copy, you, or anyone else with a clone, can still access all of those files by checking out the commit that introduced them. – Andy Nov 11 '11 at 00:13
1

git rm <deleted file path> and then git commit will clean the working directory.

Tasneem Haider
  • 359
  • 3
  • 9
0

You can use

git checkout -- < file path >

After, when you use git status, your file will not show in modified.

Simón Ramírez Amaya
  • 2,436
  • 2
  • 14
  • 31
Wprog_dy
  • 67
  • 5
0

Add the folder to your .gitignore locally as well.

Duncan Babbage
  • 19,972
  • 4
  • 56
  • 93