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

De-Github and opensource #6

Merged
merged 0 commits into from
Sep 26, 2012
Merged

De-Github and opensource #6

merged 0 commits into from
Sep 26, 2012

Conversation

jch
Copy link
Contributor

@jch jch commented Sep 24, 2012

I created a pull-request for #4, but realized that this branch has to be force pushed into master because of history changes. I've removed GitHub specific filters, and the tests are passing.

cc: @github/dotcom

@defunkt
Copy link
Contributor

defunkt commented Sep 24, 2012

What about the TeamMentionFilter, IssueMentionFilter, and CommitMentionFilter? Are you planning on leaving them in the gem? They seem GitHub specific.

@defunkt
Copy link
Contributor

defunkt commented Sep 24, 2012

I think we could probably leave in the user @mention filter and just make the URL pattern customizable.

@rtomayko
Copy link
Contributor

Yeah that one is really valuable. I'd hate to not have it when adding this to another project. Right now it verifies that the user actually exists though, which prevents some annoying false positives in a lot of cases. I guess as the number of users go up toward infinity this will be less useful :)

@jch
Copy link
Contributor Author

jch commented Sep 24, 2012

git-fu question: If I've already filter-branch rm'ed the @mention filter, how can I bring it back into the history from a separate branch? I can cherry-pick the commit that started the file, but if there are subsequent commits, I'll miss those.

@defunkt I already removed TeamMentionFilter, IssueMentionFilter, and CommitMentionFilter files, but I forgot to remove the autoload statements. Stripping them in the next commit.

@rtomayko
Copy link
Contributor

@jch:

git checkout THE-BRANCH -- path/to/file.rb

One of git's most useful commands, hidden behind a totally different type of operation. This doesn't change your branch. It stages the version of path/to/file.rb that's on THE-BRANCH so you can commit.

This was the last step I took on the history branch by the way. Once all history was imported, I checked out the version of all files from master and committed so the trees would be identical even though the history was totally different.

@rtomayko
Copy link
Contributor

This is also why it's so fucking nice to have all that history even if its not part of the tip commit. You can trivially restore any previous file in an instant.

@ymendel
Copy link
Contributor

ymendel commented Sep 24, 2012

@rtomayko : Indeed. Also, it makes perfect sense that it's part of the checkout command, once you understand why it's part of that command.

@defunkt
Copy link
Contributor

defunkt commented Sep 24, 2012

@jch Ah cool. I just noticed your opensource branch. Why isn't that just master?

If you don't want it to be master, please make a pull request. Internally at GitHub we use pull requests to track the life of a branch and regularly open them before the branch is ready to be merged.

@jch
Copy link
Contributor Author

jch commented Sep 24, 2012

So I had a PR open with that branch, but I closed it because it
auto-included a lot of people in the issue. I didn't want to spam people on
accident.

On Mon, Sep 24, 2012 at 4:18 PM, Chris Wanstrath
notifications@github.comwrote:

@jch https://github.com/jch Ah cool. I just noticed your opensourcebranch. Why isn't that just master?

If you don't want it to be master, please make a pull request. Internally
at GitHub we use pull requests to track the life of a branch and regularly
open them before the branch is ready to be merged.


Reply to this email directly or view it on GitHubhttps://github.com/github/github-html/issues/6#issuecomment-8838593.

-Jerry
@whatcodecraves http://twitter.com/whatcodecraves
github http://github.com/jch

@jbarnette
Copy link
Contributor

Don't worry about that. People can unsubscribe. :)

@defunkt
Copy link
Contributor

defunkt commented Sep 24, 2012

@jch Ah yeah, makes sense, but spam away!

@rick
Copy link

rick commented Sep 25, 2012

@jbarnette++

Give 'em the full stream. Knowing is half the battle.

@defunkt
Copy link
Contributor

defunkt commented Sep 26, 2012

hey @jch can we merge this into master?

@jch jch merged commit a89e1e9 into master Sep 26, 2012
@jch
Copy link
Contributor Author

jch commented Sep 26, 2012

Force pushed into master.

On Wed, Sep 26, 2012 at 3:42 PM, Chris Wanstrath
notifications@github.comwrote:

hey @jch https://github.com/jch can we merge this into master?


Reply to this email directly or view it on GitHubhttps://github.com/github/github-html/pull/6#issuecomment-8909130.

-Jerry
@whatcodecraves http://twitter.com/whatcodecraves
github http://github.com/jch

@gjtorikian gjtorikian deleted the opensource branch June 3, 2022 19:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants