GIT：推送后不需要的文件

Question

I'm using openshift, I have a remote git repository that look like this :

 .gitignore (contains "data/") 
 /source
 - test.php 
 /data
 - 1.png
 - 2.jpg

I checkout this repository on my computer. Then I change test.php . In same time, I deleted on the remote repository the files : 1.png & 2.jpg and I add the file smile.jpg .

remote:

 .gitignore (contains "data/") 
 /source
 - test.php 
 /data
 - smile.jpg

local

 .gitignore (contains "data/") 
 /source
 - test.php (changed)
 /data
 - 1.png
 - 2.jpg

Then when I : git add / git commit / git push the test.php modification from my computer. My smile.png is replaced by the older files ( 1.png & 2.jpg ).

What did I do wrong ? I would like to keep my smile.jpg file.

PS: my remote repository is my production website and data contains all uploaded file. On each push, all my uploaded files are deleted :(

---

git status before git commit

$ git status
warning: LF will be replaced by CRLF in test.php.
The file will have its original line endings in your working directory.
On branch master
Changes to be committed:
  (use "git reset HEAD <file>..." to unstage)

        modified:   test.php

Answer 1

如果在文件已添加到 git 后将data/*文件夹添加到.gitignore ，则必须

$ git rm data/1.png ; git rm data/2.png

Answer 2

If you are using Openshift, you have to use the openshift ~/app-root/data folder. The following question should help you to solve your problem How to keep file sync'd in OpenShift?