Skip to content

Commit

Permalink
Refine Icon? exclusion in .gitignore
Browse files Browse the repository at this point in the history
Summary:
Icon? is too general and its causing us to ignore folders like webapp's `topic_icons/icons`. This
diff refines the pattern using a tip from: https://wolfgang.reutz.at/2015/06/16/git-ignore-mac-osx-icon-files/.

Specifically, I removed `Icon?` from the `.gitignore` template and then executed the following:

```
with open('gitignore.template', 'a') as f:
    f.write('Icon\r\r')
    f.write('# Any new entries below this line...')
```

Test Plan:
- Copy the contents of the template into `~/.gitignore`.
- Add a new file to webapp's `topic_icons/icons`.
- `git status`
    - Verify that the new file is tracked by Git.

Reviewers: csilvers

Reviewed By: csilvers

Subscribers: mroth

Differential Revision: https://phabricator.khanacademy.org/D30984
  • Loading branch information
Charles Marsh committed Sep 23, 2016
1 parent 97a2c54 commit 72d3c75
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion gitignore.template
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@
*.pyc
.svn
Thumbs.db
Icon?
*.swp
tags
*.class
Icon

# Any new entries below this line (the above two lines are actually a single Icon\r\r entry).
# See: https://wolfgang.reutz.at/2015/06/16/git-ignore-mac-osx-icon-files/.

0 comments on commit 72d3c75

Please sign in to comment.