.gitignore doesn't ignore files

Question

My .gitignore file gets ignored and the files which should be ignored are still visible.

user@host ~/workdir % git status
# On branch master
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#       modified:   .htaccess
#       modified:   application/controllers/statistics.php
#
no changes added to commit (use "git add" and/or "git commit -a")
user@host ~/workdir % cat .gitignore
.htaccess
application/config/config.php
application/config/database.php
user@host ~/workdir %

The files are in version control, but with sensible changes I dont want to push. git rm ... is not an option because the files should be in version controll (with other settings in the files). I just dont want to push my changes on this files.

maybe this post can help you http://stackoverflow.com/questions/1139762/gitignore-file-not-ignoring try it! — gersonlimadev, May 10 '13 at 04:59

score 70 · Answer 1 · answered Oct 19 '11 at 11:27

i had same problem: i wanted different .htaccess file per repository then i couldn't because htaccess file had already been added to repository. It's working now, i can change any of the .htaccess file from any version without getting git pushing them. Marc is right when he says "You need to remove it first, before it can be ignored. This can be done using git rm".

i proceeded in this order:

backup your .htaccess file somewhere
remove .htaccess file using git rm .htaccess
commit this change (.htaccess deletion)
push it (git push)

this will obviously remove your .htaccess file

then edit .gitignore and add /.htaccess
commit then push it
recreate your .htaccess file by restoring your previous backup

then you're done: whatever changes you make into .htaccess won't be pushed anymore. The hard part is following steps order...

hope this is clear

The forward slash! It was driving me mad, i had just `.htaccess` on my gitignore file — sledgeweight, Feb 18 '15 at 09:44

score 48 · Accepted Answer · edited May 23 '17 at 12:34

48

after anybug's steps noted here my git still kept track of .htaccess and this helped:

git update-index --assume-unchanged .htaccess

To revert back:

git update-index --no-assume-unchanged .htaccess

edited May 23 '17 at 12:34

Community

1
1

answered Jun 20 '12 at 13:00

tabacitu

6,047
1
23
37

2

You can revert that effect by `git update-index --no-assume-unchanged` – doc_id Dec 08 '14 at 21:43

VonC · Answer 3 · 2012-07-02T05:43:57.317

13

Since you want to:

keep .htaccess in the Git repo (no git rm)
have local sensitive data in it

use a filter driver which will:

during the checkout phase, complete the .htaccess with private data
during the commit phase clean the .htaccess from all sensitive data

content filter driver

you can then version an encrypted file that your smudge script will:

be the only one to decrypt
use in order to complete the classic (and pushed/pulled) .htaccess file.

You can version that encrypted sensible data in a special branch you won't push.
Even if you did push that file somehow, the damage would be limited, since only your workstation has the private key needed to decrypt said file.

edited Jul 02 '12 at 05:43

answered Jun 03 '10 at 10:54

VonC

1,262,500
529
4,410
5,250

+1 for the pretty picture and the filter driver. I was wondering when you'd pitch in this being a version control question and all. :) – Noufal Ibrahim Jun 03 '10 at 10:59
+1 for automation. I was going to suggest `git update-index --assume-unchanged`, which may still work as a simple solution, but this kind of automation is fantastic. – Rob Wilkerson Jun 03 '10 at 12:12
+1 for the sheer fact that anybody knows how to wield all this arcane git stuff. This was not what I was looking for, but still! – PapaFreud Apr 21 '11 at 07:29

score 10 · Answer 4 · edited May 05 '14 at 12:52

10

Suppose the below is the content of .gitignore file. Here, .htaccess is in the project's root directory.

/.htaccess
application/config/config.php
application/config/database.php

Let's run the below command to ignore the .htaccess, config.php and database.php files.

badelal143@gmail.com:work-dir$ git update-index --assume-unchanged .htaccess
badelal143@gmail.com:work-dir$ git update-index --assume-unchanged application/config/config.php
badelal143@gmail.com:work-dir$ git update-index --assume-unchanged application/config/database.php

If you want to start tracking it again:

badelal143@gmail.com:work-dir$ git update-index --no-assume-unchanged path/to/file

e.g.

badelal143@gmail.com:work-dir$ git update-index --no-assume-unchanged .htaccess

edited May 05 '14 at 12:52

senshin

10,022
7
46
59

answered Apr 01 '14 at 11:33

Bade Lal

101
1
3

This worked for me. My code is inside project's `/code/` dir. `$ git update-index --assume-unchanged code/.htaccess`. And SourceTree don't track it any more. – Vladimir Vukanac May 05 '14 at 12:46
this is the only thing that worked for me. was driving me crazy, thank you – james-see Jun 22 '16 at 02:51

score 8 · Answer 5 · answered Jun 03 '10 at 10:36

8

It seems that the .htaccess file has already been added to the version control. You need to remove it first, before it can be ignored. This can be done using git rm

answered Jun 03 '10 at 10:36

Marc

3,550
22
28

I know, but I don't want to delete the file. I just want to ignore the changes – f00860 Jun 03 '10 at 10:38
If there is a version of .htaccess in the version control, but you just don't want to commit any changes, .gitignore won't work. There is no option for this as far as I know. Just don't add that file to a commit. – Marc Jun 03 '10 at 10:42
6

you can use git rm --cached which will leave the file in the directory standing but remove it from the index – Peter Tillemans Jun 03 '10 at 11:11

Noufal Ibrahim · Answer 6 · 2010-06-03T10:53:16.070

8

Ignoring files in git doesn't mean that you won't push them. It means that you won't version control them. If you don't want to push then, I suggest you create a local branch which will contain stuff for the local machine and then merge necessary changes to a branch which you'll push to remote.

I think you've already added your files and are now trying to ignore them.

edited Jun 03 '10 at 10:53

answered Jun 03 '10 at 10:37

Noufal Ibrahim

71,383
13
135
169

2

A other way I use now is to stash the local changes and pop the stash back after merging/rebasing. – f00860 Jun 04 '10 at 23:47
I had this file on my ignore list and somehow "add"-ed it as well. Good call @Naufal – Josh Metcalfe Nov 02 '11 at 19:21
1

Didn't really answer the question, but @anybug's answer did. – MikeSchinkel Feb 02 '14 at 19:07

score 5 · Answer 7 · answered Jun 19 '14 at 03:40

5

I do this all the time. I start with configuration files in my repo then decide that I don't want them in there.

You can remove something from your repo by using

git rm --cached <<filename>>

answered Jun 19 '14 at 03:40

Jason Yarrington

71
2
7

score 2 · Answer 8 · answered Jun 03 '10 at 10:34

2

This one bugged me for days. The .htaccess file is already under version control and has been modified.

answered Jun 03 '10 at 10:34

Marcelo Cantos

181,030
38
327
365

.gitignore doesn't ignore files

8 Answers8

Linked