Re: Feature Request Google Authenticator Support
Hey, On Thu, Jan 30, 2014 at 6:28 AM, Erik Faye-Lund kusmab...@gmail.com wrote: On Thu, Jan 30, 2014 at 5:07 AM, Max Rahm ac90b...@gmail.com wrote: Github supports google authenticator 2-step authentication. I enabled it and how can't figure out how to connect to my github account through git. I've looked pretty hard in the man pages and on google and can't seem to find anything on how to set up git to work with a repository with 2-step verification. Here's a link to my stackoverflow question with my exact problem if there's something I'm missing. http://stackoverflow.com/questions/21447137/git-github-not-working-with-google-authenticator-osx As far as I can tell the feature is not supported. I'd like to be able to use the 2-step authentication but obviously I'd like to be able to push my code :D This sounds like a question for the GitHub support rather than the Git community. Erik is right, for any GitHub questions, emailing supp...@github.com is way better than using this list. The answer to your question, however, is that you have to use a personal access token: https://help.github.com/articles/providing-your-2fa-security-code#through-the-command-line You can generate one from this page, in the Personal Access Tokens section: https://github.com/settings/applications Thanks! -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: material for git training sessions/presentations
The GitHub training team has all of their materials open sourced under a CC BY 3.0 license. They're all written in Markdown and hosted on GitHub. You can check them out here, including going through an online rendering of the materials: http://training.github.com/kit/ Scott On Sun, May 4, 2014 at 9:18 PM, Chris Packham judge.pack...@gmail.com wrote: Hi, I know there are a few people on this list that do git training in various forms. At $dayjob I've been asked to run a few training sessions in house. The initial audience is SW developers so they are fairly clued up on VCS concepts and most have some experience (although some not positive) with git. Eventually this may also include some QA folks who are writing/maintaining test suites who might be less clued up on VCSes in general. I know if I googled for git tutorials I'll find a bunch and I can probably write a few myself but does anyone have any advice from training sessions they've run about how best to present the subject matter. Particularly to a fairly savy audience who may have developed some bad habits. My plan was to try and have a few PCs/laptops handy and try to make it a little interactive. Also if anyone has any presentations I could use under a CC-BY-SA (or other liberal license) as a basis for any material I produce that would save me starting from scratch. Thanks, Chris -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] notes: accept any ref for merge
Currently if you try to merge notes, the notes code ensures that the
reference is under the 'refs/notes' namespace. In order to do any sort
of collaborative workflow, this doesn't work well as you can't easily
have local notes refs seperate from remote notes refs.
This patch changes the expand_notes_ref function to check for simply a
leading refs/ instead of refs/notes to check if we're being passed an
expanded notes reference. This would allow us to set up
refs/remotes-notes or otherwise keep mergeable notes references outside
of what would be contained in the notes push refspec.
Signed-off-by: Scott Chacon scha...@gmail.com
---
notes.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/notes.c b/notes.c
index 5fe691d..78d58af 100644
--- a/notes.c
+++ b/notes.c
@@ -1293,7 +1293,7 @@ int copy_note(struct notes_tree *t,
void expand_notes_ref(struct strbuf *sb)
{
- if (starts_with(sb-buf, refs/notes/))
+ if (starts_with(sb-buf, refs/))
return; /* we're happy */
else if (starts_with(sb-buf, notes/))
strbuf_insert(sb, 0, refs/, 5);
--
2.0.0
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: The GitTogether
Actually, responding to some of the feedback I've been getting, I'm thinking of having a single day of just core developers and then a day or two of users, or vice versa, but doing them together in a single event. Then just doing that same pattern in both the EU and the US. Scott On Fri, Sep 21, 2012 at 9:43 AM, Patrick Renaud prenau...@gmail.com wrote: Guys, Are we still talking of having two disconnected events for Git, one for core devs and one for users? -Patrick On 21 September 2012 11:23, Christian Couder christian.cou...@gmail.com wrote: On Fri, Sep 21, 2012 at 4:05 PM, Shawn Pearce spea...@spearce.org wrote: On Fri, Sep 21, 2012 at 2:20 AM, Christian Couder It is sad that people who know what is or what is not happening are not taking care of letting people on this list know about it... I did not post to this mailing list about the Gerrit Code Review user summit because I did not consider it to be on-topic to this list. We do not normally discuss Gerrit Code Review here. Most users and developers on this list only work on git-core (aka git.git aka the thing Junio maintains). Gerrit... is a different animal. :-) It would have been nice if you had said earlier on this list/thread that Google chose to host a Gerrit user summit instead of the traditional GitTogether. If you are interested in attending, it is Saturday November 10th and Sunday 11th in Mountain View, CA. The user summit is invite only, but you may request an invitation at http://goo.gl/5HYlB. Thanks for the information. I think it is indeed interesting to know about it. I have no further information about the potential GitTogether than anyone else. IIRC there is a suggestion in this thread about hosting something in the EU sometime in early next year, with someone at GitHub acting as organizer. Before I posted what you wrote on the Gerrit mailing list, the only information people had on this list/thread was about a GitHub proposal to organize 2 different GitTogether: the developer-centric one in Berlin in early October (a few weeks before the Mentor Summit this time) and the user one in January or February of next year. Google chose to run only a Gerrit user summit this year because of the mix of attendees at the last GitTogether. The group was about 60-70% Gerrit users/admins. We felt it was time to host something specific for that audience. Gerrit users/admins are probably Git users/admins too. But anyway, it is ok of course for Google to organize whatever it prefers. I hope GitHub will do as good a job running a GitTogether as Google did. Thanks, Christian. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Links broken in ref docs.
So, this is due to the major AWS outage today. git-scm.com is hosted on Heroku and thus on AWS. Heroku is continuing to bring up their database systems in the wake of the massive AWS outage. Once that is back online, git-scm.com will also be back online. As for the git-fetch issue, we'll look into it once Heroku is back online. Scott On Mon, Oct 22, 2012 at 7:34 PM, Mike Norman mknor...@gmail.com wrote: This seems worse. The entire site is now down with an application error. Reporting this out of surprise and just in case the dev on the job has the site cached somehow and can't see the error. Image (hopefully) attached and the message is as appears below, in case the attachment gets stripped. (Tags for convenience and not part of error.) errortext Application Error An error occurred in the application and your page could not be served. Please try again in a few moments. If you are the application owner, check your logs for details. /errortext Hope this helps, Mike Norman On Sun, Oct 21, 2012 at 9:45 PM, Andrew Ardill andrew.ard...@gmail.com wrote: On 21 October 2012 18:31, Mike Norman mknor...@gmail.com wrote: Many links on scm-git.org/docs simply reload the page. For example, all of Sharing and Updating section simply reload the docs page. And tons others. Must be a broken link or routing problem. Repros on FF 14.0.1 and Chrome. Good luck! Including Scott Chacon as he manages this site (to my knowledge). Looking at the request, I am getting a 302: Request URL:http://git-scm.com/docs/git-fetch Request Method:GET Status Code:302 Moved Temporarily Maybe those pages are not done yet? That doesn't seem right as this is simply the reference manual, but perhaps there is something else going on here. On another (related) note, the wayback machine has some very interesting entries for the scm-git.org domain [1] and it seems the /doc directory is not indexed at all. Is this on purpose? Regards, Andrew Ardill [1] http://wayback.archive.org/web/*/http://git-scm.com/* -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git-aware HTTP transport docs
I don't believe it was ever merged into the Git docs. I have a copy of it here: https://www.dropbox.com/s/pwawp8kmwgyc3w2/http-protocol.txt Scott On Tue, Feb 12, 2013 at 5:34 PM, H. Peter Anvin h...@zytor.com wrote: Hi Shawn, You wrote a really great protocol spec for the smart HTTP protocol back in the day. It would be really great if it could be checked into the git repository (updated if need be). Someone mentioned today trying to reverse-engineer the protocol because of a lack of specs, and I was a bit surprised to day the least. -hpa -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git Merge 2013 Conference, Berlin
Right now we have: Dev day: 50 User day: 295 Hack day: 200 I'm not sure what the actual turnout will be, but it looks like it's going to be pretty massive. I wanted to go through the Dev day signups and figure out if everyone really belongs there (is an actual contributor to a core git project) but it's basically on the honor system now. If anyone on this list that should be there (Junio, Shawn, etc) wants to attend and would like sponsorship for the flight/lodging, please let me know. We would love to have as many of the core people there as possible. I will also try to record everything and summarize as much as I can after the fact, so if you can't attend it should still be possible to get the general idea of what occurred and was discussed. I'm going to try doing something similar in the SF area in maybe 6-8 months from this, assuming it's a success. Scott On Mon, Feb 18, 2013 at 1:17 PM, Jeff King p...@peff.net wrote: On Mon, Feb 18, 2013 at 09:52:34PM +0100, Thomas Rast wrote: Scott Chacon scha...@gmail.com writes: We're starting off in Berlin, May 9-11th. GitHub has secured conference space at the Radisson Blu Berlin for those days. I have a smaller room for the first day so we can get 30-40 Git implementors together to talk about the future of Git and whatnot. [...] http://git-merge.com/ So this has been fairly quiet -- is anyone else coming? :-) I am. I think Scott may have actual numbers, but my third-hand impression was that there have been a lot of signups. -Peff -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git Merge 2013 Conference, Berlin
Hey, On Tue, Feb 19, 2013 at 7:41 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: Michael J Gruber venit, vidit, dixit 19.02.2013 16:20: Well, all days are listed as sold out on the eventbrite site. Maybe it's because eventbrite has trouble connecting to facebook because I don't have facebook? No, it's because 300 people signed up and that's all the venue has room for. I'm sure we can fit one more if you come. I do plan to come (unless I'm out due to lack of an eventbrite ticket) but will stay with family rather than at the Radisson Blu. BTW: Is it OK to add that event as an event on our Git community page? Just wanted to ask Scott and Junio before doing it myself. Yes, this is fine. Scott -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git Merge 2013 Conference, Berlin
Hey, On Tue, Feb 19, 2013 at 11:19 AM, Junio C Hamano gits...@pobox.com wrote: Scott Chacon scha...@gmail.com writes: On Tue, Feb 19, 2013 at 7:41 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: Michael J Gruber venit, vidit, dixit 19.02.2013 16:20: Well, all days are listed as sold out on the eventbrite site. Maybe it's because eventbrite has trouble connecting to facebook because I don't have facebook? No, it's because 300 people signed up and that's all the venue has room for. I'm sure we can fit one more if you come. Hmph. git shortlog -s -n --since=18.months master tells me that we have 284 contributors to my tree during the said period. I do not remember if I signed-up for the dev-day or any other days myself. 300 is the number of people signed up for the User Day. There is a Dev Day, for contributors, which has 50 signed up. If anyone on this list or any other core Git devs want to attend and did not sign up, or would like financial assistance getting to or staying in Germany, please let me know. The second day is a User Day, which is when 300 people will be there. This is a day for short talks, idea generation and feedback. The third day is Hack Day, which will have about 200. This is a day for working on stuff. Scott -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git Merge 2013 Conference, Berlin
Hey, On Tue, Feb 19, 2013 at 1:26 PM, Junio C Hamano gits...@pobox.com wrote: Scott Chacon scha...@gmail.com writes: On Tue, Feb 19, 2013 at 11:19 AM, Junio C Hamano gits...@pobox.com wrote: Scott Chacon scha...@gmail.com writes: On Tue, Feb 19, 2013 at 7:41 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: Michael J Gruber venit, vidit, dixit 19.02.2013 16:20: Well, all days are listed as sold out on the eventbrite site. Maybe it's because eventbrite has trouble connecting to facebook because I don't have facebook? No, it's because 300 people signed up and that's all the venue has room for. I'm sure we can fit one more if you come. ... 300 is the number of people signed up for the User Day. There is a Dev Day, for contributors, which has 50 signed up. Ah, sorry I misunderstood. So your 300 above was about the user day, and Dev day has different capacity but has already sold out at 50 seats. Yes. There is only so much room and I didn't want to overload the dev day. Those of you who want to come on any of these days are still welcome, I just don't want more random people signing up. If you still wish to attend, simply email me personally and I will add you. Junio, are you interested in attending? Scott -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
The GitTogether
For the last few years, there has been a gathering of Gitty people in Mountain View directly following the GSoC Mentor Summit that is referred to as a GitTogether: https://git.wiki.kernel.org/index.php/GitTogether A few of us have been talking about what we would like to do this year and thinking about the gatherings the past few years and how we could get the most out of it. I would like to see two different gatherings this year - one that would be user-centric to gather people that use Git together with some of the developers and talk about Git from a user's perspective. The other event I would like to see would be a gathering of many of the core Git developers in a sort of hacker summit. GitHub would like to volunteer to organize and pay for these events this year. I would like to hold the developer-centric one in Berlin in early October (a few weeks before the Mentor Summit this time) and the user one in January or February of next year. The general idea of the developer one in October would be to get 30-40 people who work directly on Git core, JGit and libgit2 (or closely related projects) together to discuss core issues, new features, etc. GitHub can help with travel and lodging for participants who need it, but attendance would be limited to people actually working on Git the most. Similar to some of the earlier GitTogethers. The user conference early next year would be held in San Francisco or nearby and would be a chance for people using Git to share how they're using it, what they would like to see, etc. I would expect to host far more people at this - closer to 100, something like the last GitTogether. I'm working on putting together websites for the two events for registration, schedule and to gather topics that should be discussed. I am planning on having the talks recorded and put online as well. I wanted to get some general feedback from the ML about what they think about this plan before I finalized everything though. For those of you who *have* been to a GitTogether, what did you find useful and/or useless about it? What did you get out of it and would like to see again? For those of you who have never been, what do you think would be useful? I was thinking for both of them to have a combination of short prepared talks, lightning/unconference style talks and general discussion / breakout sessions. Finally, is there any feedback on the times and places - especially the Berlin one. If nobody can agree on a better specific time, I'll push forward with early October in Berlin, but if there is a concensus around a different time, I'm fine moving it. Scott -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Important articles on git-scm.com no more accessible
Sorry about that - a recent PR that was merged changed the routes that handled this for some reason. I just added the historical routes back and they all should work again. Scott On Wed, May 1, 2013 at 8:57 PM, Konstantin Khomoutov kostix+...@007spb.ru wrote: On Wed, 1 May 2013 14:38:02 -0400 Jeff King p...@peff.net wrote: [...] Recently I discovered that a number of useful articles which sort of accompanied the Pro Git book are now inaccessible (404), namely: Smart HTTP Transport [1], Reset Demystified [2], Note to Self [3] and Git Loves the Environment [4]. I wonder if this is a known problem and/or whom I could contact about this issue? 1. http://git-scm.com/2010/03/04/smart-http.html 2. http://git-scm.com/2011/07/11/reset.html 3. http://git-scm.com/2010/08/25/notes.html 4. http://git-scm.com/2010/04/11/environment.html I think those links were broken by the site reorganization about a year ago. You can get to them at: http://git-scm.com/blog/2010/03/04/smart-http.html Oh, I was about to respond that links I referred to are returned by Google search for their respective article titles (it did so yesterday). So I went to verify this and just observed that Google started to return liks pointing to (supposedly) Scott Chacon's site, like http://scottchacon.com/2011/07/11/reset.html for the Reset demystified article. Hence I suppose Scott was just transferring those articles to their new home. and so on. In general, problems with git-scm.com should be reported at: https://github.com/github/gitscm-next Thanks! -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Git Merge 2013 Conference, Berlin
Hey, On Fri, May 10, 2013 at 9:10 PM, Sebastian Schuberth sschube...@gmail.com wrote: On 23.01.2013 20:27, Scott Chacon wrote: As you may remember, we did not have a GitTogether last year. Since I miss drinking and talking Git nerdiness with all of you, I'm going to try organizing some face time on a semi-regular basis. I would like to try to do a small Git conference in the US and the EU each year. We're starting off in Berlin, May 9-11th. GitHub has secured conference space at the Radisson Blu Berlin for those days. I have a It's a pity that you did not announce the event on the msysgit mailing list, too, which is why I totally missed it until today, the event being almost over. This is especially sad for me as I'm living in Berlin, so it would have been easy for me to attend, and as I had offered to help you organizing the event when you were still looking for a location last year. I apologize, I will try to put events on that list as well in the future. Scott -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: git-scm.com website
Hey, On Mon, Mar 9, 2015 at 9:06 AM, David Kastrup d...@gnu.org wrote: On Mon, Mar 9, 2015 at 6:57 AM, Michael J Gruber g...@drmicha.warpmail.net wrote: Since we're talking business: git-scm.com still looks a bit like a ProGit/Github promotion site. I don't have anything against either, and git-scm.com provides a lot of the information that users are looking for, and that are hard to find anywhere else; it's a landing page. It just does not look like a project home. I'm sorry that you feel this way, but I've tried pretty hard to make sure the site is as neutral as possible. The only actual place the string GitHub occurs on the landing page is at the bottom where it says This open sourced site is hosted on GitHub. I don't even mention anywhere that GitHub pays for hosting it. Also, all the Amazon referrals from Pro Git sales are donated to the Software Freedom Conservancy and all my personal royalties are donated to charity. It also very clearly states that the book is free to read online in it's entirety (which is actually relatively expensive for me personally, since I personally pay the S3 hosting and bandwidth costs for all the eBook downloads). I'm not sure why you think it doesn't look like a project home. It has basically all the same information on it that you would find on any other project home page: a description, direct links to downloads, source code, documentation, a book, community and development information, etc. These are basically all the same things found on sites like http://www.gnu.org/software/emacs/ or https://subversion.apache.org/. It features Companies Projects Using Git at the bottom. Not supporting but using. Linux is point 10 on that list. The first 6 items are Google, facebook, Microsoft, Twitter, LinkedIn, and Netflix. Even for an OpenSource project that does not buy into the Free Software philosophy, that is a mostly embarrassing list of companies to advertise for. Well, there are 16 groups listed on that page and 10 are open source projects and the remaining 6 are large companies using Git and open sourcing things using it. The idea of the list is to give people new to Git confidence that it is widely adopted both in the open source and corporate worlds. I also am not sure what's embarrassing about these companies - they all heavily participate in the open source community and many of them sponsor development of projects like Linux and Git. Personally, I consider the recent migration of the Emacs repository to Git a bigger endorsement but then that's me. I would love to have Emacs on that page, actually. If you guys want me to add that, I'm happy to. I didn't know they moved over, I thought they were still a bzr shop. It might make sense to reduce this list just to Projects since those are actually more tangible and verifiable. Or scrap it altogether. Sorry, I disagree with this. I think it's helpful for people to see some important corporations that are using it, since many people coming to the page are doing research to figure out if they want to switch to it in their companies. It also demonstrates that these large companies are participating in the open source community and it may help them decide to open source internal corporate projects as well, which I think is beneficial to everyone. Scott -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: git-scm.com website
Hey, On Mon, Mar 9, 2015 at 10:12 AM, Christian Couder christian.cou...@gmail.com wrote: A few other points about git-scm.com: * as Michael says it still looks a bit like a ProGit/Github promotion site * some of the pull request can be rejected even if the developers want them, like this pull request to add back a list of contributors was: https://github.com/git/git-scm.com/pull/216 (By the way this pull request talks about bugs in https://github.com/git/git/graphs/contributors that are still not fixed...) It should be noted that Peff has write access to this repository and I think the SFC manages the DNS for the site as well, so technically it is maintained by us. If he had felt strongly about the addition, I easily could have been convinced to do it, but I didn't think it was helpful in a larger sense. I try very hard to maintain a balance of simplicity and function. This site is mostly for people new to the project - it helps them see what Git is for, how to use it well and how to get involved. If you put everything you can into the site it makes it harder to find other things that may be more important. It's also important to remember that a home page is not really primarily for the people in this list. It's for the people who may one day be interested in this list and for the far greater number of people who want to use the end result of the hard work of the people on this list. It hopefully reduces the support and explanation style questions that might otherwise be sent to this list by helping to explain things before people resort to asking you all. It's meant to be a tool shielding you all from the introductory questions that would otherwise probably just annoy you. That all said, if someone is interested in helping with the maintenance and going over these pull requests, I'm more than happy to give them access, but I really want to maintain the simplicity and professional sense of design that we've worked very hard to maintain. Not every patch that works that comes to Junio is accepted and not every pull request that comes into the site will be merged for the same reason - we want to maintain the quality and utility of the resource. There have been 157 merged pull requests from the community in the past year or so, 13 of which were from the author you're mentioning in this example. You pointed to the one pull request out of 14 total patches from Peff that was not merged. It is kind of strange to say that we should contribute to a web site that promotes ProGit and GitHub a lot and where our contributions can be rejected because it is not maintained by us. Again, if you can point to a GitHub logo on any page of the website, I would love to see it. And Pro Git is free and read by hundreds of thousands of people day all over the world and available in dozens of languages in multiple ebook formats. I would remove the Amazon links if anyone wishes, but the SFC gets income from it, so I doubt they would want to. Scott -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
