Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Gitignore change #82

Merged
merged 3 commits into from Oct 23, 2018
Merged

Gitignore change #82

merged 3 commits into from Oct 23, 2018

Conversation

xforever1313
Copy link
Member

This is a simple pull request from something that bugged me...

The lib folder was marked to be ignored in the .gitignore. This appears to have been done so nothing gets committed from a lib folder that may appear during doc generation.

However, this has the side effect of any new files that get added to Teleirc's lib folder are marked as ignored by default; and sometimes files aren't committed by accident.

This modification to the .gitignore allows new files in the root's lib folder, but no where else.

How to test:

Create a new file (e.g. test.txt) in the lib folder. Then another create a new lib folder in /docs/lib/test.txt. Type "git status" on the command line. The test.txt in the lib folder should be marked as untracked, but the one in /dos/lib/test.txt should not show up:

PS C:\Users\xfore\Documents\Source\teleirc> ls .\docs\lib\


    Directory: C:\Users\xfore\Documents\Source\teleirc\docs\lib


Mode                LastWriteTime         Length Name
----                -------------         ------ ----
-a----       10/22/2018   9:22 PM              0 lol.txt


PS C:\Users\xfore\Documents\Source\teleirc> ls .\lib\


    Directory: C:\Users\xfore\Documents\Source\teleirc\lib


Mode                LastWriteTime         Length Name
----                -------------         ------ ----
d-----       10/14/2018   1:33 PM                IrcHandlers
-a----       10/22/2018   9:08 PM           1496 Helpers.js
-a----        10/4/2018  10:29 PM           1981 MessageRateLimiter.js
-a----       10/22/2018   9:08 PM          18420 TeleIrc.js
-a----        10/4/2018  10:29 PM           1520 TeleIrcErrorCodes.js
-a----        10/4/2018  10:29 PM            517 TeleIrcException.js
-a----       10/22/2018   9:19 PM              0 test.txt


PS C:\Users\xfore\Documents\Source\teleirc> git status
On branch gitignore
Your branch is up to date with 'origin/gitignore'.

Untracked files:
  (use "git add <file>..." to include in what will be committed)

        lib/test.txt
        package-lock.json

nothing added to commit but untracked files present (use "git add" to track)

At the moment, they were ignored since .gitignore was ignoring lib
because of the python virtual environment.
@jwflory jwflory self-assigned this Oct 23, 2018
@jwflory jwflory added the improvement Improves on something that already exists label Oct 23, 2018
@jwflory jwflory modified the milestone: v1.2.1 Oct 23, 2018
Copy link
Member

@jwflory jwflory left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for making these changes and explaining it thoroughly. Everything makes sense to me. Merging! 🎬

@jwflory jwflory merged commit bdb42a1 into RITlug:master Oct 23, 2018
jwflory pushed a commit that referenced this pull request Nov 23, 2018
* Allow new files in lib to be added via git.

At the moment, they were ignored since .gitignore was ignoring lib
because of the python virtual environment.

* Needed to put a slash in front...

* Wording.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
improvement Improves on something that already exists
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants