From cbb57bdc3a879bac250c28e2ec9aee141d0dd730 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 24 Feb 2015 13:42:57 +0100 Subject: [PATCH 0001/3183] Add "language", "difficulty" and "possible mentors" information to the "git bisect improvements" section --- SoC-2015-Ideas.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SoC-2015-Ideas.md b/SoC-2015-Ideas.md index 61c6e0aeb..92e185e0c 100644 --- a/SoC-2015-Ideas.md +++ b/SoC-2015-Ideas.md @@ -34,6 +34,10 @@ the end of line, with updates to "am". Cf. Date: Wed, 25 Feb 2015 10:24:35 +0100 Subject: [PATCH 0002/3183] Update builtin project proposal Based on @moy's advice --- SoC-2015-Ideas.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/SoC-2015-Ideas.md b/SoC-2015-Ideas.md index 92e185e0c..927e42ff8 100644 --- a/SoC-2015-Ideas.md +++ b/SoC-2015-Ideas.md @@ -156,5 +156,8 @@ multiple platforms, e.g. Windows (think: POSIX-to-Windows path conversion issues). The idea of this project is to dive into the Git source code and -convert, say, `git-add--interactive.perl` and/or `git stash` into -proper C code, making it a so-called "built-in". +convert a couple of shell and/or Perl scripts into portable and +performant C code, making it a so-called "built-in". + +The plan is to start with something small, such as `git-pull.sh` to +get into the groove, and then advance to more complex scripts. From e920a7b047617a607b55671bbd2c0f61881d0e84 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 4 Mar 2015 02:42:15 -0500 Subject: [PATCH 0003/3183] soc-2015-ideas: add reference for `bisect --first-parent` I may have accidentally done the first part of the project. Oops. --- SoC-2015-Ideas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoC-2015-Ideas.md b/SoC-2015-Ideas.md index 927e42ff8..7b9beca04 100644 --- a/SoC-2015-Ideas.md +++ b/SoC-2015-Ideas.md @@ -44,7 +44,7 @@ When your project is strictly "new features are merged into trunk, never the other way around", it is handy to be able to first find a merge on the trunk that merged a topic to point fingers at when a bug appears, instead of having to drill down to the individual -commit on the faulty side branch. +commit on the faulty side branch. Cf. #### "git bisect fixed/unfixed" From 4e1879268cd9395c223075796cf2e4cfbf147a72 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Wed, 4 Mar 2015 08:05:44 +0100 Subject: [PATCH 0004/3183] Ask students to include a link to their microproject in their application It makes it easier for us when reviewing/selecting candidates. --- SoC-2015-Ideas.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SoC-2015-Ideas.md b/SoC-2015-Ideas.md index 7b9beca04..43b24a991 100644 --- a/SoC-2015-Ideas.md +++ b/SoC-2015-Ideas.md @@ -16,6 +16,10 @@ way for us to get experience with applicants, but it will also help applicants become familiar with Git's development and submission process. +Please, include link(s) to the mailing-list discussion(s) related to +your microproject in your application (e.g. linking to +[gmane](http://news.gmane.org/gmane.comp.version-control.git)). + ## Summer of code main project ideas **Students**: Please consider these ideas as starting points for From ec0724336eb47fe19578813683aa785bd9841723 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Wed, 4 Mar 2015 08:14:41 +0100 Subject: [PATCH 0005/3183] Disclaimer about the number of slots. This is debatable, but this may discourrage students who picked Git more or less at random. If I read https://code.google.com/p/google-summer-of-code/wiki/ProgramStatistics correctly, the average number of slots per organization is closer to 10 than 2, hence students have better chance to get accepted in other organizations. OTOH, 2 slots is not so much worse than the 3 we had last year. And now that Dscho is volunteer to mentor a GSoC too, we may actually end up accepting 3 students. --- SoC-2015-Ideas.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SoC-2015-Ideas.md b/SoC-2015-Ideas.md index 43b24a991..0ccbcdc8a 100644 --- a/SoC-2015-Ideas.md +++ b/SoC-2015-Ideas.md @@ -20,6 +20,11 @@ Please, include link(s) to the mailing-list discussion(s) related to your microproject in your application (e.g. linking to [gmane](http://news.gmane.org/gmane.comp.version-control.git)). +## Note about the number of slots + +In 2015, the Git organization has very limited mentoring capacity. +We will probably be able to accept 2 students only this year. + ## Summer of code main project ideas **Students**: Please consider these ideas as starting points for From 365b16f7ca9b7a8aabd35056fc299332b20066b6 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Fri, 6 Mar 2015 12:51:10 +0100 Subject: [PATCH 0006/3183] Suggest applicants to participate in review of other peoples' patches Idea and most of the wording comes from Junio's message on the list. I added a hint to include links to review in the application (which makes the suggestion a bit stronger since it implies that it will be taken into account in the selection). --- SoC-2015-Ideas.md | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/SoC-2015-Ideas.md b/SoC-2015-Ideas.md index 0ccbcdc8a..ba8b25e2f 100644 --- a/SoC-2015-Ideas.md +++ b/SoC-2015-Ideas.md @@ -16,9 +16,22 @@ way for us to get experience with applicants, but it will also help applicants become familiar with Git's development and submission process. +Also, working in Git project is not only about writing your own +patches. Constructively critiquing design and implementation of +patches by other people is also an important skill you need to learn +in order to effectively collaborate with others. So, if you have time +and inclination, it would be beneficial to read and understand other +applicants' patches (or any other patch submitted to the mailing-list), +think if you agree that the problem they are trying to solve is worth +solving, the approach they are taking is the best way (or if you think +of a better way to solve it), etc., and respond to their patches with +the result of your thinking as a review. + Please, include link(s) to the mailing-list discussion(s) related to your microproject in your application (e.g. linking to -[gmane](http://news.gmane.org/gmane.comp.version-control.git)). +[gmane](http://news.gmane.org/gmane.comp.version-control.git)). If you +participate in the review of other patches, then you may also include +links to discussions that would support your application. ## Note about the number of slots From 59d9107d40f613bab52bc8b0b020dc32aa51ea3f Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 15 Mar 2015 09:08:44 +0100 Subject: [PATCH 0007/3183] Add rev_news.md about possible news letter --- rev_news/rev_news.md | 46 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 rev_news/rev_news.md diff --git a/rev_news/rev_news.md b/rev_news/rev_news.md new file mode 100644 index 000000000..864f8be71 --- /dev/null +++ b/rev_news/rev_news.md @@ -0,0 +1,46 @@ +--- +layout: default +title: Git Rev News +--- + +This is a page to explain what Git Rev News could be. + +## Promoting reviewers and helpers + +The main goal of Git Rev News would be to promote the work of people +reviewing patches and doing user support on the Git mailing list. + +Note that as there can be a lot of traffic on the Git mailing list and +as people writing Git Rev News would probably work on it on their free +time, readers should not expect all the Git reviews and support to be +covered. + +## Help people learn about Git development + +By reading Git Rev News people could learn about Git developement and +become interested in participating in it. + +## Propagate misc Git news + +A lot of interesting things around Git happen outside the Git mailing +list and might be worth propagating to show how vibrant the Git +community and its ecosystem are. + +Also Git developers might have some personnal (like getting maried, +having a child, ...) or professional (looking for a Git related job or +freelance mission) information they want to share. + +## Why the name Git Rev News? + +"Rev" can be understood both as an abbreviation of "revision" and as +an abbreviation of "reviews". It is probably better to have a name +that is not too tied to a particular schedule or a particular kind of +news. + +## Who would write or contribute to it + +A few editors would be expected to write most of it, especially the +parts about reviews and support. But everyone would be welcome to +contribute using pull requests. + + From 66fc9b3120daab5e233400d084bd0b5730614886 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 17 Mar 2015 10:19:01 +0100 Subject: [PATCH 0008/3183] Add repo and website information Add information about where the news letter would be prepared and published. --- rev_news/rev_news.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rev_news/rev_news.md b/rev_news/rev_news.md index 864f8be71..d8dfccc42 100644 --- a/rev_news/rev_news.md +++ b/rev_news/rev_news.md @@ -37,10 +37,13 @@ an abbreviation of "reviews". It is probably better to have a name that is not too tied to a particular schedule or a particular kind of news. -## Who would write or contribute to it +## Who would write or contribute to it? A few editors would be expected to write most of it, especially the parts about reviews and support. But everyone would be welcome to contribute using pull requests. +The news letter would be prepared on https://github.com/git/git.github.io +and published on https://git.github.io and perhaps elsewhere too. + From cf444d668928607ea83da93d59220b5cf09bfac5 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 17 Mar 2015 10:20:28 +0100 Subject: [PATCH 0009/3183] Replace Promoting with Promote --- rev_news/rev_news.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/rev_news.md b/rev_news/rev_news.md index d8dfccc42..92586a89b 100644 --- a/rev_news/rev_news.md +++ b/rev_news/rev_news.md @@ -5,7 +5,7 @@ title: Git Rev News This is a page to explain what Git Rev News could be. -## Promoting reviewers and helpers +## Promote reviewers and helpers The main goal of Git Rev News would be to promote the work of people reviewing patches and doing user support on the Git mailing list. From 8f74a2829a03faca41829d115a13d74cb4c81ce4 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 18 Mar 2015 08:06:05 +0100 Subject: [PATCH 0010/3183] Gather some ideas on how to produce content Just for starters. --- rev_news/news_sources.md | 41 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 rev_news/news_sources.md diff --git a/rev_news/news_sources.md b/rev_news/news_sources.md new file mode 100644 index 000000000..ace1b2d4c --- /dev/null +++ b/rev_news/news_sources.md @@ -0,0 +1,41 @@ +--- +layout: default +title: Git Rev News Sources +--- + +Some ideas on where we can go to gather Git Rev News material. + +## Mailing lists + +* Git dev +* Git for Windows +* JGit +* libgit2 (and friends) +* ... + +## Blogs (the RSS-feeds can be aggregated into one shared resource) + +* Junio's blog +* Company blogs of GitHub, BitBucket, GitLab, etc. +* ... + +## Forums + +* Hacker News (can be monitored using Google Alerts) +* Reddit/git (offers RSS) +* Git community on Google+ +* ... + +### Process + +* For every upcoming issue, post a mail/thread to the Git dev list asking + if there's anything anyone want included in the upcoming issue. +* Also, post an issue on github.com/git/news asking for + comments/contributions from the community as a whole (anyone can + comment on this issue). +* The GitHub issue can also be used to gather interesting links that we find + on the above sources. Each interesting link is just added as a comment. +* At the end of the month, paste it all into an .md file that goes into some + sort of blog on git.github.io/news + +Some inspiration/ideas here perhaps: http://thechangelog.com/trello-as-a-cms/ From 4dfc2648fd30a1bdaf131e2baa3241164b2c6b78 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 18 Mar 2015 22:50:47 +0100 Subject: [PATCH 0011/3183] Refer to instances of news as "editions" The term "issue" is heavily loaded within GitHub, so let's just avoid it. --- rev_news/news_sources.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/news_sources.md b/rev_news/news_sources.md index ace1b2d4c..26a2a6b0b 100644 --- a/rev_news/news_sources.md +++ b/rev_news/news_sources.md @@ -26,10 +26,10 @@ Some ideas on where we can go to gather Git Rev News material. * Git community on Google+ * ... -### Process +# Process -* For every upcoming issue, post a mail/thread to the Git dev list asking - if there's anything anyone want included in the upcoming issue. +* For every upcoming edition, post a mail/thread to the Git dev list asking + if there's anything anyone want included in the upcoming edition. * Also, post an issue on github.com/git/news asking for comments/contributions from the community as a whole (anyone can comment on this issue). From 6d7a8eececb37f2874574c5dfd99bc38fb7682ab Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 18 Mar 2015 23:09:16 +0100 Subject: [PATCH 0012/3183] Incorporate the latest ideas, tidy up a bit See discussion in #17 and under 8f74a28. --- rev_news/news_sources.md | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/rev_news/news_sources.md b/rev_news/news_sources.md index 26a2a6b0b..63ee15a83 100644 --- a/rev_news/news_sources.md +++ b/rev_news/news_sources.md @@ -28,14 +28,16 @@ Some ideas on where we can go to gather Git Rev News material. # Process -* For every upcoming edition, post a mail/thread to the Git dev list asking - if there's anything anyone want included in the upcoming edition. -* Also, post an issue on github.com/git/news asking for - comments/contributions from the community as a whole (anyone can - comment on this issue). -* The GitHub issue can also be used to gather interesting links that we find - on the above sources. Each interesting link is just added as a comment. -* At the end of the month, paste it all into an .md file that goes into some - sort of blog on git.github.io/news +For every upcoming edition, do the following: + +* Create a new edition-[number].md file in some draft directory. +* Post a mail/thread to the Git dev list asking if + there's anything anyone wants included in the upcoming edition. +* Post an issue in this GitHub repository asking for + comments/contributions - anyone can comment on this, or send pull- + requests for editing the edition.md file. +* When the time comes to release the edition, move the edition.md file + into some designated publishing directory, so it appears in + the feed on git.github.io/rev_news/. Some inspiration/ideas here perhaps: http://thechangelog.com/trello-as-a-cms/ From 9ceb77e67accd1dad34ba20f704625e08abad2a9 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 20 Mar 2015 13:57:12 +0100 Subject: [PATCH 0013/3183] rev_news: create proper links --- rev_news/rev_news.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rev_news/rev_news.md b/rev_news/rev_news.md index 92586a89b..b01855f98 100644 --- a/rev_news/rev_news.md +++ b/rev_news/rev_news.md @@ -43,7 +43,7 @@ A few editors would be expected to write most of it, especially the parts about reviews and support. But everyone would be welcome to contribute using pull requests. -The news letter would be prepared on https://github.com/git/git.github.io -and published on https://git.github.io and perhaps elsewhere too. +The news letter would be prepared on [GitHub](https://github.com/git/git.github.io) +and published on (git.github.io)[https://git.github.io] and perhaps elsewhere too. From 132e6cd69b3098e4158159d2ac39cc4ed8e54428 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 20 Mar 2015 13:58:06 +0100 Subject: [PATCH 0014/3183] rev_news: fix link --- rev_news/rev_news.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/rev_news.md b/rev_news/rev_news.md index b01855f98..c344d002d 100644 --- a/rev_news/rev_news.md +++ b/rev_news/rev_news.md @@ -44,6 +44,6 @@ parts about reviews and support. But everyone would be welcome to contribute using pull requests. The news letter would be prepared on [GitHub](https://github.com/git/git.github.io) -and published on (git.github.io)[https://git.github.io] and perhaps elsewhere too. +and published on [git.github.io](https://git.github.io) and perhaps elsewhere too. From ad63a9d582c0b0a9a0cb0466dfa7bba036a1f059 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 20 Mar 2015 14:01:45 +0100 Subject: [PATCH 0015/3183] news_sources: add some links --- rev_news/news_sources.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/news_sources.md b/rev_news/news_sources.md index 63ee15a83..38e79cbab 100644 --- a/rev_news/news_sources.md +++ b/rev_news/news_sources.md @@ -7,15 +7,15 @@ Some ideas on where we can go to gather Git Rev News material. ## Mailing lists -* Git dev -* Git for Windows +* [Git dev](http://thread.gmane.org/gmane.comp.version-control.git/) +* [Git for Windows](https://groups.google.com/forum/#!forum/msysgit) * JGit * libgit2 (and friends) * ... ## Blogs (the RSS-feeds can be aggregated into one shared resource) -* Junio's blog +* [Junio's blog](http://git-blame.blogspot.com/) * Company blogs of GitHub, BitBucket, GitLab, etc. * ... From 4c1667a7b6a418b7264219458bb24d621b4df64f Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 20 Mar 2015 17:14:33 +0100 Subject: [PATCH 0016/3183] rev_news: add 1st edition draft --- rev_news/draft/edition-1.md | 204 ++++++++++++++++++++++++++++++++++++ 1 file changed, 204 insertions(+) create mode 100644 rev_news/draft/edition-1.md diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md new file mode 100644 index 000000000..273f0a547 --- /dev/null +++ b/rev_news/draft/edition-1.md @@ -0,0 +1,204 @@ + +Welcome to the first edition of Git Rev News! + +[Git Rev News](http://git.github.io/rev_news/rev_news.html) is written +collaboratively on [GitHub](https://github.com/git/git.github.io) by +volonteers. Feel free to help by sending [pull +requests](https://github.com/git/git.github.io/pulls) or opening +[issues](https://github.com/git/git.github.io/issues)! + +## Reviews & Support + +### Reviews + +* [make git-pull a builtin](http://thread.gmane.org/gmane.comp.version-control.git/265628/) + +Paul Tan, who will probably apply to be a [Google Summer of Code +(GSoC)](https://developers.google.com/open-source/soc/) student for +Git this year, anticipated the start of the GSoC and sent a patch to +rewrite git-pull.sh as a builtin. + +Indeed as stated in [the GSoC idea +page](http://git.github.io/SoC-2015-Ideas.html): + +``` +Many components of Git are still in the form of shell and Perl +scripts. While this is an excellent choice as long as the +functionality is improved, it causes problems in production code – in +particular on multiple platforms, e.g. Windows (think: +POSIX-to-Windows path conversion issues). +``` + +This is why the "Convert scripts to builtins" GSoC project idea is to: + +``` +... dive into the Git source code and convert a couple of shell +and/or Perl scripts into portable and performant C code, making it a +so-called "built-in". +``` + +It appeared that two developers, Duy Nguyen and Stephen Robin, had +already worked on converting git-pull.sh into a builtin in the +past. This happens quite often, so it is a good idea before starting +to develop something in Git, to search and ask around. + +Dscho, also called Johannes Schindelin, our Git for Windows expert, +thanked Paul for the very detailed and well researched comments in his +patch and commented a bit on the benefits of this kind of work: + +``` +> on Windows the runtime fell from 8m 25s to 1m 3s. + +This is *exactly* the type of benefit that makes this project so important! Nice one. + +> A simpler, but less perfect strategy might be to just convert the shell +> scripts directly statement by statement to C, using the run_command*() +> functions as Duy Nguyen[2] suggested, before changing the code to use +> the internal API. + +Yeah, the idea is to have a straight-forward strategy to convert the scripts in as efficient manner as +possible. It also makes reviewing easier if the first step is an almost one-to-one translation to +`run_command*()`-based builtins. + +Plus, it is rewarding to have concise steps that can be completed in a timely manner. +``` + +About improving the test suite, Matthieu Moy suggested: + +``` +> Ideally, I think the solution is to +> improve the test suite and make it as comprehensive as possible, but +> writing a comprehensive test suite may be too time consuming. + +time-consuming, but also very beneficial since the code would end up +being better tested. For sure, a rewrite is a good way to break stuff, +but anything untested can also be broken by mistake rather easily at any +time. + +I'd suggest doing a bit of manual mutation testing: take your C code, +comment-out a few lines of code, see if the tests still pass, and if +they do, add a failing test that passes again once you uncomment the +code. +``` + +And Junio also reviewed some parts of the patch. + +* [Forbid "log --graph --no-walk"](http://thread.gmane.org/gmane.comp.version-control.git/264899/) + +Dongcan Jiang who will also probably apply to be a GSoC student for +Git this year, sent a patch to prevent `git log` to be used with both +the `--graph` and the `--no-walk` option. He sent this patch because +the Git community asks potential students to work on a +[microproject](http://git.github.io/SoC-2015-Microprojects.html) to +make sure that they can properly work with the community. + +Eric Sunshine made some good general suggestions that are often made +on incoming patchs: + +``` +> Forbid "log --graph --no-walk + +Style: drop capitalization in the Subject: line. Also prefix with the +command or module being modified, followed by a colon. So: + + log: forbid combining --graph and --no-walk + +or: + + revision: forbid combining --graph and --no-walk + +> Because --graph is about connected history while --no-walk is about discrete points. + +Okay. You might also want to cite the wider discussion[1]. + +[1]: http://article.gmane.org/gmane.comp.version-control.git/216083 + +> revision.c: Judge whether --graph and --no-walk come together when running git-log. +> buildin/log.c: Set git-log cmd flag. +> Documentation/rev-list-options.txt: Add specification on the forbidden usage. + +No need to repeat in prose what the patch itself states more clearly +and concisely. + +Also, such a change should be accompanied by new test(s). +``` + +René Scharfe and Junio also suggested some improvements especially in the code. + +And Junio explained the interesting behavior of `git show` depending +on the arguments it is given: + +``` +When "git show" is given a range, it turns no-walk off and becomes a +command about a connected history. Otherwise, it is a command about +discrete point(s). +``` + +### Support + +* [Git with Lader logic](http://thread.gmane.org/gmane.comp.version-control.git/265679/) + +Users or potential users are sometimes wondering on the Git mailing +list if they can use Git to manage special content. Fortunately it +looks like the Git mailing list is read by many experts in different +domains who can often provide specific answers. + +This time Bharat Suvarna asked about [PLC +programs](http://en.wikipedia.org/wiki/Programmable_logic_controller) + +Kevin D gave the usual non specific answer: + +``` +Although git is not very picky about the contents, it is optimized to +track text files. Things like showing diffs and merging files only works +on text files. + +Git can track binary files, but there are some disadvantages: + +- Diff / merge doesn't work well +- Compression is often difficult, so the repository size may grow + depending on the size of the things stored +``` + +Then Randall S. Becker gave a more specific answer: + +``` +Many PLC programs either store their project code in XML, L5K or L5X (for +example), TXT, CSV, or some other text format or can import and export to +text forms. If you have a directory structure that represents your project, +and the file formats have reasonable line separators so that diffs can be +done easily, git very likely would work out for you. You do not have to have +the local .git repository in the same directory as your working area if your +tool has issues with that or .gitignore. You may want to use a GUI client to +manage your local repository and handle the commit/push/pull/merge/rebase +functions as I expect whatever PLC system you are using does not have git +built-in. +``` + +Doug Kelly also gave interesting specific information and pointed to a +web site more information. + +Thank you guys for these helpful answers! + +## Misc Git News + +### Developers + +* David Kastrup gnu.org> previously reimplemented significant +parts of "git blame" for a vast gain in performance with complex +histories and large files. As working on free software is his sole +source of income, please consider contributing to his remuneration if +you find this kind of improvements useful. + +### Events + +* [Git Merge 2015](http://git-merge.com/), The Conference for the Git +Community, will take place on April 8th & 9th in Paris, France, thanks +to GitHub and the sponsors. + +If you are a Git developer and need travel or other assistance to go +there, please contact Peff. + +### Companies + + From bd132aa387930f2045f19d3d1e08af7061ee2bdf Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 20 Mar 2015 17:23:25 +0100 Subject: [PATCH 0017/3183] rev_news edition 1: make welcome message bigger --- rev_news/draft/edition-1.md | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 273f0a547..f31bca6a9 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -1,5 +1,5 @@ -Welcome to the first edition of Git Rev News! +## Welcome to the first edition of Git Rev News! [Git Rev News](http://git.github.io/rev_news/rev_news.html) is written collaboratively on [GitHub](https://github.com/git/git.github.io) by @@ -194,9 +194,7 @@ you find this kind of improvements useful. * [Git Merge 2015](http://git-merge.com/), The Conference for the Git Community, will take place on April 8th & 9th in Paris, France, thanks -to GitHub and the sponsors. - -If you are a Git developer and need travel or other assistance to go +to GitHub and the sponsors. If you are a Git developer and need travel or other assistance to go there, please contact Peff. ### Companies From 9151b85a87c628b924216141521853158e80a1e8 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 20 Mar 2015 17:25:35 +0100 Subject: [PATCH 0018/3183] rev_news edition 1: fix dak at gnu dot org --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index f31bca6a9..00059ea92 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -184,7 +184,7 @@ Thank you guys for these helpful answers! ### Developers -* David Kastrup gnu.org> previously reimplemented significant +* David Kastrup (dak at gnu.org) previously reimplemented significant parts of "git blame" for a vast gain in performance with complex histories and large files. As working on free software is his sole source of income, please consider contributing to his remuneration if From 60642f7b66779a96274e41e1ca37d858823834ef Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sat, 21 Mar 2015 00:25:34 +0100 Subject: [PATCH 0019/3183] Fix some wording and typos --- rev_news/draft/edition-1.md | 41 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 00059ea92..e56d4f456 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -3,7 +3,7 @@ [Git Rev News](http://git.github.io/rev_news/rev_news.html) is written collaboratively on [GitHub](https://github.com/git/git.github.io) by -volonteers. Feel free to help by sending [pull +volunteers. Feel free to help by sending [pull requests](https://github.com/git/git.github.io/pulls) or opening [issues](https://github.com/git/git.github.io/issues)! @@ -16,7 +16,7 @@ requests](https://github.com/git/git.github.io/pulls) or opening Paul Tan, who will probably apply to be a [Google Summer of Code (GSoC)](https://developers.google.com/open-source/soc/) student for Git this year, anticipated the start of the GSoC and sent a patch to -rewrite git-pull.sh as a builtin. +rewrite git-pull.sh as a built-in. Indeed as stated in [the GSoC idea page](http://git.github.io/SoC-2015-Ideas.html): @@ -38,13 +38,13 @@ so-called "built-in". ``` It appeared that two developers, Duy Nguyen and Stephen Robin, had -already worked on converting git-pull.sh into a builtin in the +already worked on converting git-pull.sh into a built-in in the past. This happens quite often, so it is a good idea before starting to develop something in Git, to search and ask around. -Dscho, also called Johannes Schindelin, our Git for Windows expert, -thanked Paul for the very detailed and well researched comments in his -patch and commented a bit on the benefits of this kind of work: +Johannes "Dscho" Schindelin, one of the Git for Windows developers, +thanked Paul for the very detailed and well researched comments in +his patch and commented a bit on the benefits of this kind of work: ``` > on Windows the runtime fell from 8m 25s to 1m 3s. @@ -63,7 +63,7 @@ possible. It also makes reviewing easier if the first step is an almost one-to-o Plus, it is rewarding to have concise steps that can be completed in a timely manner. ``` -About improving the test suite, Matthieu Moy suggested: +Regarding the test suite, Matthieu Moy suggested: ``` > Ideally, I think the solution is to @@ -81,19 +81,19 @@ they do, add a failing test that passes again once you uncomment the code. ``` -And Junio also reviewed some parts of the patch. +Junio also reviewed some parts of the patch. * [Forbid "log --graph --no-walk"](http://thread.gmane.org/gmane.comp.version-control.git/264899/) -Dongcan Jiang who will also probably apply to be a GSoC student for -Git this year, sent a patch to prevent `git log` to be used with both +Dongcan Jiang, who will also probably apply to be a GSoC student for +Git this year, sent a patch to prevent `git log` from being used with both the `--graph` and the `--no-walk` option. He sent this patch because the Git community asks potential students to work on a [microproject](http://git.github.io/SoC-2015-Microprojects.html) to -make sure that they can properly work with the community. +make sure that they can work properly with the community. Eric Sunshine made some good general suggestions that are often made -on incoming patchs: +on incoming patches: ``` > Forbid "log --graph --no-walk @@ -125,7 +125,7 @@ Also, such a change should be accompanied by new test(s). René Scharfe and Junio also suggested some improvements especially in the code. -And Junio explained the interesting behavior of `git show` depending +Junio also explained the interesting behavior of `git show` depending on the arguments it is given: ``` @@ -138,15 +138,14 @@ discrete point(s). * [Git with Lader logic](http://thread.gmane.org/gmane.comp.version-control.git/265679/) -Users or potential users are sometimes wondering on the Git mailing -list if they can use Git to manage special content. Fortunately it -looks like the Git mailing list is read by many experts in different +People often ask the Git mailing list whether they can use Git to manage +special content. Fortunately, the list is monitored by many experts in different domains who can often provide specific answers. This time Bharat Suvarna asked about [PLC programs](http://en.wikipedia.org/wiki/Programmable_logic_controller) -Kevin D gave the usual non specific answer: +Kevin D gave the usual non-specific answer: ``` Although git is not very picky about the contents, it is optimized to @@ -175,10 +174,10 @@ functions as I expect whatever PLC system you are using does not have git built-in. ``` -Doug Kelly also gave interesting specific information and pointed to a +Doug Kelly also gave some interesting specific information and pointed to a web site more information. -Thank you guys for these helpful answers! +Thank you all for these helpful answers! ## Misc Git News @@ -194,8 +193,8 @@ you find this kind of improvements useful. * [Git Merge 2015](http://git-merge.com/), The Conference for the Git Community, will take place on April 8th & 9th in Paris, France, thanks -to GitHub and the sponsors. If you are a Git developer and need travel or other assistance to go -there, please contact Peff. +to GitHub and the sponsors. If you are a Git developer and need travel +or other assistance to go there, please contact Peff. ### Companies From da328245939440e11da4d79d5ce37063723bf186 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sat, 21 Mar 2015 00:34:38 +0100 Subject: [PATCH 0020/3183] More links --- rev_news/news_sources.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rev_news/news_sources.md b/rev_news/news_sources.md index 38e79cbab..280861d05 100644 --- a/rev_news/news_sources.md +++ b/rev_news/news_sources.md @@ -9,21 +9,21 @@ Some ideas on where we can go to gather Git Rev News material. * [Git dev](http://thread.gmane.org/gmane.comp.version-control.git/) * [Git for Windows](https://groups.google.com/forum/#!forum/msysgit) -* JGit -* libgit2 (and friends) +* [JGit](https://dev.eclipse.org/mailman/listinfo/jgit-dev) +* [libgit2](https://libgit2.github.com/) (and [friends](https://github.com/libgit2)) * ... ## Blogs (the RSS-feeds can be aggregated into one shared resource) * [Junio's blog](http://git-blame.blogspot.com/) -* Company blogs of GitHub, BitBucket, GitLab, etc. +* Company blogs of [GitHub](https://github.com/blog), [BitBucket](https://blog.bitbucket.org/), [GitLab](https://about.gitlab.com/blog/), etc. * ... ## Forums -* Hacker News (can be monitored using Google Alerts) -* Reddit/git (offers RSS) -* Git community on Google+ +* [Hacker News](https://news.ycombinator.com/) (can be monitored using Google Alerts or [searched](https://hn.algolia.com/?query=git&sort=byPopularity&prefix=false&page=0&dateRange=last24h&type=story)) +* [Reddit/git](http://www.reddit.com/r/git) (offers RSS) +* [Git community on Google+](https://plus.google.com/communities/112688280189071733518) * ... # Process From 40e65f1a518451298b2f5eef12a575b9cb7e0593 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sat, 21 Mar 2015 00:37:06 +0100 Subject: [PATCH 0021/3183] Link to The Changelog --- rev_news/news_sources.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/news_sources.md b/rev_news/news_sources.md index 280861d05..bb6ecc010 100644 --- a/rev_news/news_sources.md +++ b/rev_news/news_sources.md @@ -19,11 +19,12 @@ Some ideas on where we can go to gather Git Rev News material. * Company blogs of [GitHub](https://github.com/blog), [BitBucket](https://blog.bitbucket.org/), [GitLab](https://about.gitlab.com/blog/), etc. * ... -## Forums +## Forums/news * [Hacker News](https://news.ycombinator.com/) (can be monitored using Google Alerts or [searched](https://hn.algolia.com/?query=git&sort=byPopularity&prefix=false&page=0&dateRange=last24h&type=story)) * [Reddit/git](http://www.reddit.com/r/git) (offers RSS) * [Git community on Google+](https://plus.google.com/communities/112688280189071733518) +* [The Changelog/Git](http://thechangelog.com/tagged/git/) * ... # Process From 21d56715498378dc9211ac2f54150e24499e20cd Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 21 Mar 2015 08:28:16 +0100 Subject: [PATCH 0022/3183] rev_news edition 1: add Peff's real name --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index e56d4f456..c976c4556 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -194,7 +194,7 @@ you find this kind of improvements useful. * [Git Merge 2015](http://git-merge.com/), The Conference for the Git Community, will take place on April 8th & 9th in Paris, France, thanks to GitHub and the sponsors. If you are a Git developer and need travel -or other assistance to go there, please contact Peff. +or other assistance to go there, please contact Peff, aka Jeff King. ### Companies From 36a0b2ac10ae442951fff595fe3dfd4b919646b8 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 21 Mar 2015 09:04:13 +0100 Subject: [PATCH 0023/3183] rev_news edition 1: add Peff's email address --- rev_news/draft/edition-1.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index c976c4556..5201f2c8d 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -194,7 +194,8 @@ you find this kind of improvements useful. * [Git Merge 2015](http://git-merge.com/), The Conference for the Git Community, will take place on April 8th & 9th in Paris, France, thanks to GitHub and the sponsors. If you are a Git developer and need travel -or other assistance to go there, please contact Peff, aka Jeff King. +or other assistance to go there, please contact Peff, aka +Jeff King <>. ### Companies From f06da1ffaceb4dc05ab51a4ff7a3c76497f31a8d Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sun, 22 Mar 2015 00:56:31 +0100 Subject: [PATCH 0024/3183] Add credits --- rev_news/draft/edition-1.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 5201f2c8d..22e6f3632 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -197,6 +197,7 @@ to GitHub and the sponsors. If you are a Git developer and need travel or other assistance to go there, please contact Peff, aka Jeff King <>. -### Companies +## Credits +This edition of Git Rev Notes was assembled by Christian Couder <> and Thomas Ferris Nicolaisen <>. From afa22784ae8a4fc067096b5f95ef1a7296976973 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sun, 22 Mar 2015 00:57:44 +0100 Subject: [PATCH 0025/3183] Add links and news --- rev_news/draft/edition-1.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 22e6f3632..64a51b13f 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -197,6 +197,17 @@ to GitHub and the sponsors. If you are a Git developer and need travel or other assistance to go there, please contact Peff, aka Jeff King <>. +### From outside the list + +* Google Code [announced their shutdown](http://google-opensource.blogspot.de/2015/03/farewell-to-google-code.html), offering all remaining projects easy migration to Git/GitHub. +* Nava Whiteford wrote a popular article on the [Most common Git screwups/questions and solutions](http://41j.com/blog/2015/02/common-git-screwupsquestions-solutions/). +* An older but related resource: [Flight rules for Git](https://github.com/k88hudson/git-flight-rules). +* Commandline GUI-tool *tig* [version 1.2 was released released](http://article.gmane.org/gmane.comp.version-control.git/265298). +* An [interview with Git book "Git in Practice" author, Mike McQuaid](http://www.infoq.com/articles/interview-Mike-McQuaid-git-practice). +* Speaking of Git books, there's a new one on the way: [Git Essentials](https://www.packtpub.com/application-development/git-essentials). +* And there's [a new video course out on mastering Git](https://www.packtpub.com/application-development/mastering-git-video). The author was just interviewed on.... +* [The latest episode of GitMinutes](http://episodes.gitminutes.com/2015/03/gitminutes-33-thom-parkin-on-mastering.html). +* Here's a [Git hook](https://github.com/naholyr/github-todos/wiki/Full-presentation) which will automatically turn new TODOs into tasks in your issue tracker (if you use GitHub issues). ## Credits From a57699542d959e24efbda6c2ba9329ed825a8710 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sun, 22 Mar 2015 01:03:50 +0100 Subject: [PATCH 0026/3183] Finer links --- rev_news/draft/edition-1.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 64a51b13f..ef31ada25 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -200,13 +200,13 @@ Jeff King <>. ### From outside the list * Google Code [announced their shutdown](http://google-opensource.blogspot.de/2015/03/farewell-to-google-code.html), offering all remaining projects easy migration to Git/GitHub. -* Nava Whiteford wrote a popular article on the [Most common Git screwups/questions and solutions](http://41j.com/blog/2015/02/common-git-screwupsquestions-solutions/). +* Nava Whiteford wrote a popular article on the [most common Git screwups/questions and solutions](http://41j.com/blog/2015/02/common-git-screwupsquestions-solutions/). * An older but related resource: [Flight rules for Git](https://github.com/k88hudson/git-flight-rules). -* Commandline GUI-tool *tig* [version 1.2 was released released](http://article.gmane.org/gmane.comp.version-control.git/265298). +* Commandline GUI-tool *tig* [version 1.2 was released](http://article.gmane.org/gmane.comp.version-control.git/265298). * An [interview with Git book "Git in Practice" author, Mike McQuaid](http://www.infoq.com/articles/interview-Mike-McQuaid-git-practice). * Speaking of Git books, there's a new one on the way: [Git Essentials](https://www.packtpub.com/application-development/git-essentials). * And there's [a new video course out on mastering Git](https://www.packtpub.com/application-development/mastering-git-video). The author was just interviewed on.... -* [The latest episode of GitMinutes](http://episodes.gitminutes.com/2015/03/gitminutes-33-thom-parkin-on-mastering.html). +* The [latest episode of the podcast GitMinutes](http://episodes.gitminutes.com/2015/03/gitminutes-33-thom-parkin-on-mastering.html), about mastering Git. * Here's a [Git hook](https://github.com/naholyr/github-todos/wiki/Full-presentation) which will automatically turn new TODOs into tasks in your issue tracker (if you use GitHub issues). ## Credits From b3518fc790160f1d71811757f548805351aed89d Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 22 Mar 2015 13:16:24 +0100 Subject: [PATCH 0027/3183] rev_news edition 1: use "as of version 2.1.0" ... instead of "previously" --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index ef31ada25..784f561a3 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -183,7 +183,7 @@ Thank you all for these helpful answers! ### Developers -* David Kastrup (dak at gnu.org) previously reimplemented significant +* David Kastrup (dak at gnu.org) as of version 2.1.0 reimplemented significant parts of "git blame" for a vast gain in performance with complex histories and large files. As working on free software is his sole source of income, please consider contributing to his remuneration if From bc8b777bfe094baccafdedd45932743ce9f5f882 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sun, 22 Mar 2015 18:36:57 +0100 Subject: [PATCH 0028/3183] Curated sounds better than assembled --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 784f561a3..3b2cea042 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -211,4 +211,4 @@ Jeff King <>. ## Credits -This edition of Git Rev Notes was assembled by Christian Couder <> and Thomas Ferris Nicolaisen <>. +This edition of Git Rev Notes was curated by Christian Couder <> and Thomas Ferris Nicolaisen <>. From 5fb6e8c0ae0d28ef326a83abc0bf478a7eef9d65 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sun, 22 Mar 2015 22:10:28 +0100 Subject: [PATCH 0029/3183] More meta about the publication in header Some "what" and "whens" based on feedback from Junio. Still needs some "why". I'm assuming we'll go monthly, but if anyone feels more ambitious, feel free to change that. --- rev_news/draft/edition-1.md | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 3b2cea042..fed6859fe 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -1,11 +1,19 @@ -## Welcome to the first edition of Git Rev News! +## Git Rev News: Edition 1 (March 25th, 2015) -[Git Rev News](http://git.github.io/rev_news/rev_news.html) is written -collaboratively on [GitHub](https://github.com/git/git.github.io) by -volunteers. Feel free to help by sending [pull +Welcome to the first edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +a montly digest of all things Git, written collaboratively +on [GitHub](https://github.com/git/git.github.io) by volunteers. + +Our goal is to aggregate and communicate +the activities on the [Git developers' mailig list](mailto:git@vger.kernel.org) +in a format that the wider tech community can follow +and understand. In addition, we'll link to all the interesting Git-related +articles, tools and projects we come across. + +Tips us or contribute news by sending [pull requests](https://github.com/git/git.github.io/pulls) or opening -[issues](https://github.com/git/git.github.io/issues)! +[issues](https://github.com/git/git.github.io/issues). ## Reviews & Support From e18b4718c5ac347feca14d9f4942ca49037bcf67 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sun, 22 Mar 2015 22:32:02 +0100 Subject: [PATCH 0030/3183] Links to SSH vulnerability thingy And one typo. --- rev_news/draft/edition-1.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index fed6859fe..a293d1fce 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -2,7 +2,7 @@ ## Git Rev News: Edition 1 (March 25th, 2015) Welcome to the first edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), -a montly digest of all things Git, written collaboratively +a monthly digest of all things Git, written collaboratively on [GitHub](https://github.com/git/git.github.io) by volunteers. Our goal is to aggregate and communicate @@ -216,6 +216,8 @@ Jeff King <>. * And there's [a new video course out on mastering Git](https://www.packtpub.com/application-development/mastering-git-video). The author was just interviewed on.... * The [latest episode of the podcast GitMinutes](http://episodes.gitminutes.com/2015/03/gitminutes-33-thom-parkin-on-mastering.html), about mastering Git. * Here's a [Git hook](https://github.com/naholyr/github-todos/wiki/Full-presentation) which will automatically turn new TODOs into tasks in your issue tracker (if you use GitHub issues). +* Both [GitLab](https://about.gitlab.com/2015/03/19/omnibus-gitlab-openssl-security-release/) and [BitBucket](https://blog.bitbucket.org/2015/03/19/openssl-security-advisory/) recently posted advisories on recent SSH vulnerabilities. Make +sure that your Git or otherwise SSH-based services are not affected! ## Credits From 51757849c79cedfaaba4c2a36c6ab0ad743d3a07 Mon Sep 17 00:00:00 2001 From: stefanbeller Date: Sun, 22 Mar 2015 14:32:41 -0700 Subject: [PATCH 0031/3183] fix typo --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index a293d1fce..210ae8abc 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -6,7 +6,7 @@ a monthly digest of all things Git, written collaboratively on [GitHub](https://github.com/git/git.github.io) by volunteers. Our goal is to aggregate and communicate -the activities on the [Git developers' mailig list](mailto:git@vger.kernel.org) +the activities on the [Git developers' mailing list](mailto:git@vger.kernel.org) in a format that the wider tech community can follow and understand. In addition, we'll link to all the interesting Git-related articles, tools and projects we come across. From 44a25745b77618e14016169569c976c850c9aa6c Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 22 Mar 2015 16:52:41 -0700 Subject: [PATCH 0032/3183] revnews: Git mailing list is not only for developers http://git.github.io/rev_news/rev_news.html calls the list "Git mailng list"; be consistent and welcoming to non developers. --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 210ae8abc..204026ac2 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -6,7 +6,7 @@ a monthly digest of all things Git, written collaboratively on [GitHub](https://github.com/git/git.github.io) by volunteers. Our goal is to aggregate and communicate -the activities on the [Git developers' mailing list](mailto:git@vger.kernel.org) +the activities on the [Git mailing list](mailto:git@vger.kernel.org) in a format that the wider tech community can follow and understand. In addition, we'll link to all the interesting Git-related articles, tools and projects we come across. From 9b6b3e83094ad6dd7a929f38c858923a5f595525 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 22 Mar 2015 18:37:48 -0700 Subject: [PATCH 0033/3183] revnews: mention the discussion on revnews itself Retitle the "Reviews & Support" section to "Discussions", add "General" subsection next to "Reviews" and "Support", and mention the discussion thread that resulted in the creation of this newsletter. --- rev_news/draft/edition-1.md | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 204026ac2..e116810af 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -15,7 +15,25 @@ Tips us or contribute news by sending [pull requests](https://github.com/git/git.github.io/pulls) or opening [issues](https://github.com/git/git.github.io/issues). -## Reviews & Support +## Discussions + +### General + +* [Promoting Git developers](http://thread.gmane.org/gmane.comp.version-control.git/265165) + +In a discussion started by Christian Couder, Michael J Gruber noted +that there are three classes of Git developers, and it is hard for +people who are not already sponsored by corporations to work on Git +not as a hobbist, but as a means to gain either monetarily or build +reputation. + +Later in the thread, Christian volunteered to start a newsletter (this +newsletter!) to summarize and publicise works by participants and +Thomas Ferris Nicolaisen, who runs a popular podcast GitMinutes, +offered to help. + +Also, it was decided that release notes will list new and returning +contributors and thank for their help for each release. ### Reviews From 971cdfd1d10f0d25c217921b1b781114271310f1 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 22 Mar 2015 18:48:05 -0700 Subject: [PATCH 0034/3183] revnews: remove meaningless "X also reviewed" The fact that the patch was reviewed by the maintainer does not add much value to the section by itself. It is a different matter if it were accompanied by a summary of value the review added to the discussion, but otherwise it only makes the section longer without adding much value ot the reader. --- rev_news/draft/edition-1.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 204026ac2..e15936f73 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -89,8 +89,6 @@ they do, add a failing test that passes again once you uncomment the code. ``` -Junio also reviewed some parts of the patch. - * [Forbid "log --graph --no-walk"](http://thread.gmane.org/gmane.comp.version-control.git/264899/) Dongcan Jiang, who will also probably apply to be a GSoC student for From 153400ed83a51a3ecc883ee6f89f0f03e353e9c5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 22 Mar 2015 21:29:13 -0700 Subject: [PATCH 0035/3183] revnews: be explicit about the date range The oldest topic covered in the current writing is $gmane/264899 "log --graph --no-walk" from early March. By being explicit about the earliest date, set the expectation of readers to avoid possible complaints e.g. "why isn't that topic that is a lot more interesting covered here?" --- rev_news/draft/edition-1.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 204026ac2..5f1351ec6 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -11,6 +11,8 @@ in a format that the wider tech community can follow and understand. In addition, we'll link to all the interesting Git-related articles, tools and projects we come across. +This edition covers what happened during the month of March 2015. + Tips us or contribute news by sending [pull requests](https://github.com/git/git.github.io/pulls) or opening [issues](https://github.com/git/git.github.io/issues). From 1009831c0d5336079722fc8190aec3edcbd0ebf7 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 23 Mar 2015 05:50:55 +0100 Subject: [PATCH 0036/3183] rev_news edition 1: add "some of" ... before "the activities" --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index ac3d48ec7..0b86ec52b 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -6,7 +6,7 @@ a monthly digest of all things Git, written collaboratively on [GitHub](https://github.com/git/git.github.io) by volunteers. Our goal is to aggregate and communicate -the activities on the [Git mailing list](mailto:git@vger.kernel.org) +some of the activities on the [Git mailing list](mailto:git@vger.kernel.org) in a format that the wider tech community can follow and understand. In addition, we'll link to all the interesting Git-related articles, tools and projects we come across. From 337945c0654ff911a48ef0c8965533c94baba8d3 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 23 Mar 2015 05:53:17 +0100 Subject: [PATCH 0037/3183] rev_news edition 1: add Junio Hamano in Credits --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 0b86ec52b..230db5017 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -239,4 +239,4 @@ sure that your Git or otherwise SSH-based services are not affected! ## Credits -This edition of Git Rev Notes was curated by Christian Couder <> and Thomas Ferris Nicolaisen <>. +This edition of Git Rev Notes was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Junio Hamano. From 114a07510b7599af5c9e8c1d5f6d0858177b4788 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 23 Mar 2015 06:09:53 +0100 Subject: [PATCH 0038/3183] rev_news edition 1: use another "some of" --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 230db5017..9fb4fa34b 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -8,7 +8,7 @@ on [GitHub](https://github.com/git/git.github.io) by volunteers. Our goal is to aggregate and communicate some of the activities on the [Git mailing list](mailto:git@vger.kernel.org) in a format that the wider tech community can follow -and understand. In addition, we'll link to all the interesting Git-related +and understand. In addition, we'll link to some of the interesting Git-related articles, tools and projects we come across. This edition covers what happened during the month of March 2015. From 7ce07854b9285ec7b1edf6f3b59d5c0abe06fd74 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 23 Mar 2015 06:10:45 +0100 Subject: [PATCH 0039/3183] rev_news edition 1: replace SSH with OpenSSL --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 9fb4fa34b..f2c9f73d7 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -234,7 +234,7 @@ Jeff King <>. * And there's [a new video course out on mastering Git](https://www.packtpub.com/application-development/mastering-git-video). The author was just interviewed on.... * The [latest episode of the podcast GitMinutes](http://episodes.gitminutes.com/2015/03/gitminutes-33-thom-parkin-on-mastering.html), about mastering Git. * Here's a [Git hook](https://github.com/naholyr/github-todos/wiki/Full-presentation) which will automatically turn new TODOs into tasks in your issue tracker (if you use GitHub issues). -* Both [GitLab](https://about.gitlab.com/2015/03/19/omnibus-gitlab-openssl-security-release/) and [BitBucket](https://blog.bitbucket.org/2015/03/19/openssl-security-advisory/) recently posted advisories on recent SSH vulnerabilities. Make +* Both [GitLab](https://about.gitlab.com/2015/03/19/omnibus-gitlab-openssl-security-release/) and [BitBucket](https://blog.bitbucket.org/2015/03/19/openssl-security-advisory/) recently posted advisories on recent OpenSSL vulnerabilities. Make sure that your Git or otherwise SSH-based services are not affected! ## Credits From de62f02897f5487c169597010ccaf28aa30b7587 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 23 Mar 2015 06:12:19 +0100 Subject: [PATCH 0040/3183] rev_news edition 1: use News instead of Notes --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index f2c9f73d7..9ae790e48 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -239,4 +239,4 @@ sure that your Git or otherwise SSH-based services are not affected! ## Credits -This edition of Git Rev Notes was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Junio Hamano. +This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Junio Hamano. From a9b8df877ae13373a2734f78ad78ecd4717cfae9 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 23 Mar 2015 06:16:47 +0100 Subject: [PATCH 0041/3183] rev_news edition 1: add people who helped --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 9ae790e48..a2b57d8c3 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -239,4 +239,4 @@ sure that your Git or otherwise SSH-based services are not affected! ## Credits -This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Junio Hamano. +This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Junio Hamano with help from Matthieu Moy, Jeff King, Stefan Beller and Alex Vandiver. From 01e426d14b4bf4dc0b640faac0eb1fc682a8a4f4 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 23 Mar 2015 06:18:11 +0100 Subject: [PATCH 0042/3183] rev_news edition 1: add David among the helpers --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index a2b57d8c3..defbbeed4 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -239,4 +239,4 @@ sure that your Git or otherwise SSH-based services are not affected! ## Credits -This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Junio Hamano with help from Matthieu Moy, Jeff King, Stefan Beller and Alex Vandiver. +This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Junio Hamano with help from Matthieu Moy, Jeff King, David Kastrup, Stefan Beller and Alex Vandiver. From 58a473dcade5b94fc5d7d39dcaf6d01ae34ca108 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 23 Mar 2015 07:35:23 +0100 Subject: [PATCH 0043/3183] rev_news edition 1: move Junio among helpers ... as he requested. --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index defbbeed4..aa72cf4dd 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -239,4 +239,4 @@ sure that your Git or otherwise SSH-based services are not affected! ## Credits -This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Junio Hamano with help from Matthieu Moy, Jeff King, David Kastrup, Stefan Beller and Alex Vandiver. +This edition of Git Rev News was curated by Christian Couder <> and Thomas Ferris Nicolaisen <> with help from Junio Hamano, Matthieu Moy, Jeff King, David Kastrup, Stefan Beller and Alex Vandiver. From a42a2972febeb736ecccbd8259e9c61847a73038 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Mon, 23 Mar 2015 09:13:20 +0100 Subject: [PATCH 0044/3183] Tips is not a word in English I meant "to tip", as in "give someone information in a discreet or confidential way". It doesn't sound so good there though, so I reword it instead. --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index aa72cf4dd..168a74f21 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -13,7 +13,7 @@ articles, tools and projects we come across. This edition covers what happened during the month of March 2015. -Tips us or contribute news by sending [pull +You can contribute to the upcoming edition by sending [pull requests](https://github.com/git/git.github.io/pulls) or opening [issues](https://github.com/git/git.github.io/issues). From 6f45c649534cdfa8bc687d17cc91f04caeda1fe4 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Mon, 23 Mar 2015 09:14:41 +0100 Subject: [PATCH 0045/3183] Typo --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 168a74f21..11c07fc38 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -26,7 +26,7 @@ requests](https://github.com/git/git.github.io/pulls) or opening In a discussion started by Christian Couder, Michael J Gruber noted that there are three classes of Git developers, and it is hard for people who are not already sponsored by corporations to work on Git -not as a hobbist, but as a means to gain either monetarily or build +not as a hobbyist, but as a means to gain either monetarily or build reputation. Later in the thread, Christian volunteered to start a newsletter (this From a1cb58f5cc521380b9b40d1944e4a1aacafa6827 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Mon, 23 Mar 2015 11:02:51 +0100 Subject: [PATCH 0046/3183] Mention David Kastrup in "Promoting Git developers" My feeling reading the list is that the discussion leading to this rev news was actually initiated by David Kastrup's message, hence he should be the one to credit here (even though his message insisted more on the problem than on solutions). --- rev_news/draft/edition-1.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 11c07fc38..bdd3aae47 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -23,7 +23,8 @@ requests](https://github.com/git/git.github.io/pulls) or opening * [Promoting Git developers](http://thread.gmane.org/gmane.comp.version-control.git/265165) -In a discussion started by Christian Couder, Michael J Gruber noted +Following up to a message from David Kastrup, a discussion was initiated +by Christian Couder where Michael J Gruber noted that there are three classes of Git developers, and it is hard for people who are not already sponsored by corporations to work on Git not as a hobbyist, but as a means to gain either monetarily or build From 1d1166217b21775b7986e81fdbac0570cb9a302a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 23 Mar 2015 12:29:51 -0700 Subject: [PATCH 0047/3183] revnews: another instance of s/SSH/OpenSSL/ fix --- rev_news/draft/edition-1.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 11c07fc38..dce1222e2 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -234,8 +234,8 @@ Jeff King <>. * And there's [a new video course out on mastering Git](https://www.packtpub.com/application-development/mastering-git-video). The author was just interviewed on.... * The [latest episode of the podcast GitMinutes](http://episodes.gitminutes.com/2015/03/gitminutes-33-thom-parkin-on-mastering.html), about mastering Git. * Here's a [Git hook](https://github.com/naholyr/github-todos/wiki/Full-presentation) which will automatically turn new TODOs into tasks in your issue tracker (if you use GitHub issues). -* Both [GitLab](https://about.gitlab.com/2015/03/19/omnibus-gitlab-openssl-security-release/) and [BitBucket](https://blog.bitbucket.org/2015/03/19/openssl-security-advisory/) recently posted advisories on recent OpenSSL vulnerabilities. Make -sure that your Git or otherwise SSH-based services are not affected! +* Both [GitLab](https://about.gitlab.com/2015/03/19/omnibus-gitlab-openssl-security-release/) and [BitBucket](https://blog.bitbucket.org/2015/03/19/openssl-security-advisory/) recently posted advisories on recent OpenSSL vulnerabilities. +Make sure that your Git or otherwise OpenSSL-based services are not affected! ## Credits From f0eaadfcfd6b20b7075ae557233185cac4c72ae0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 23 Mar 2015 12:48:33 -0700 Subject: [PATCH 0048/3183] revnews: talk about &&-chain test --- rev_news/draft/edition-1.md | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 11c07fc38..81e283555 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -160,6 +160,49 @@ command about a connected history. Otherwise, it is a command about discrete point(s). ``` +* [War on broken &&-chain](http://thread.gmane.org/gmane.comp.version-control.git/265874) + +We often see review comments on test scripts that points out a +breakage in the &&-chain, but what does that mean? + +When you have a test that looks like this: + +``` +test_expect_success 'frotz and nitfol work' ' + git frotz + git nitfol +' +``` + +the test framework will not detect even if the `frotz` command +exits with a non-zero error status. A test must be written like +this instead: + +``` +test_expect_success 'frotz and nitfol work' ' + git frotz && + git nitfol +' +``` + +Jeff resurrected a clever idea, which was first floated by Jonathan +Nieder in October 2013, to automate detection of such an issue. The +idea is to try running the test body with this magic string prefixed: +`(exit 117) &&`. If everything is properly chained together with `&&` +in the test, running such a test will exit with error code 117 (and +the important assumption is that error code is unused elsewhere). If +on the other hand, if there is an breakage, the test prefixed with the +magic string would either succeed or fail with a code different from +117. His work caught many real test breakages but fortunately it was +found that no command being tested was failing ;-) + +As the variety of platforms each developer has access to and the time +each developer has to test Git on them is inevitably limited, broken +&&-chains in some tests that Jeff didn't run were expected to be +caught by others. Torsten Bögershausen did find one in a test that +runs only on a case insensitive filesystem a few days later. + + ### Support * [Git with Lader logic](http://thread.gmane.org/gmane.comp.version-control.git/265679/) From 6a4ce36bd13277268787c2b36d8f4377f93b5ce7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 23 Mar 2015 14:13:30 -0700 Subject: [PATCH 0049/3183] revnews: sample "contributing writer" attribution Earlier I suggested in the discussion on 337945c to make some articles written by contributing writers as such. Here is a sample of what I meant. --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 81e283555..2ee3d10d2 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -160,7 +160,7 @@ command about a connected history. Otherwise, it is a command about discrete point(s). ``` -* [War on broken &&-chain](http://thread.gmane.org/gmane.comp.version-control.git/265874) +* [War on broken &&-chain](http://thread.gmane.org/gmane.comp.version-control.git/265874) (*written by Junio C Hamano*) We often see review comments on test scripts that points out a breakage in the &&-chain, but what does that mean? From b9880163901cf3c0dc9df85d9e7d1d204ad98cf1 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Mon, 23 Mar 2015 23:50:29 +0100 Subject: [PATCH 0050/3183] Don't commit to monthly As discussed on the mailing list, we want to keep this undecided. --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index dce1222e2..4b4de7f0d 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -2,7 +2,7 @@ ## Git Rev News: Edition 1 (March 25th, 2015) Welcome to the first edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), -a monthly digest of all things Git, written collaboratively +a digest of all things Git, written collaboratively on [GitHub](https://github.com/git/git.github.io) by volunteers. Our goal is to aggregate and communicate From 765180653a2d21d703e3340f905c582bfbf459ac Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 24 Mar 2015 09:30:22 +0100 Subject: [PATCH 0051/3183] rev_news edition 1: add written by Junio ...next to the Promoting Git Developers section --- rev_news/draft/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index 046888067..c129d6feb 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -21,7 +21,7 @@ requests](https://github.com/git/git.github.io/pulls) or opening ### General -* [Promoting Git developers](http://thread.gmane.org/gmane.comp.version-control.git/265165) +* [Promoting Git developers](http://thread.gmane.org/gmane.comp.version-control.git/265165) (*written by Junio C Hamano*) Following up to a message from David Kastrup, a discussion was initiated by Christian Couder where Michael J Gruber noted From 4781161f3c23f1b146a8b2f8f70d58ff6892aad8 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Tue, 24 Mar 2015 15:30:17 +0100 Subject: [PATCH 0052/3183] revnews: mention some recent releases I figure it is interesting to mention recent Git "core" releases, as well as in related projects (libgit2, jgit, etc). --- rev_news/draft/edition-1.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index c129d6feb..d2d690ea4 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -267,6 +267,34 @@ to GitHub and the sponsors. If you are a Git developer and need travel or other assistance to go there, please contact Peff, aka Jeff King <>. +### Releases + +* [Git v.2.3.2](http://permalink.gmane.org/gmane.linux.kernel/1902789), March 6th. +``` +The latest maintenance release Git v2.3.2 is now available at +the usual places. +``` +* [NodeGit 0.3.0](https://github.com/nodegit/nodegit/releases/tag/v0.3.0), March 13th: +``` +Updated to libgit2 v0.22.1. This release contains breaking API changes. Most +noteworthy is the change to how certificate errors are handled during authentication. + +For more details check out the change log: http://www.nodegit.org/changelog/#v0-3-0 +``` +* [Git v.2.3.3](http://permalink.gmane.org/gmane.linux.kernel/1908634), March 14th: +``` +The latest maintenance release Git v2.3.3 is now available at +the usual places. It is comprised of 26 non-merge commits since +v2.3.2, contributed by 11 people, 1 of which is a new contributor. +``` +* [Git v2.3.4](http://permalink.gmane.org/gmane.linux.kernel/1915412), March 23rd: +``` +The latest maintenance release Git v2.3.4 is now available at the +usual places. It is comprised of 22 non-merge commits since v2.3.3, +contributed by 9 people, 1 of which is a new face. All these fixes +have already been in the 'master' branch for some time. +``` + ### From outside the list * Google Code [announced their shutdown](http://google-opensource.blogspot.de/2015/03/farewell-to-google-code.html), offering all remaining projects easy migration to Git/GitHub. From 903dd7c8dafa9ae655b86134d0077a14d36a384d Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 24 Mar 2015 20:06:39 +0100 Subject: [PATCH 0053/3183] rev_news edition 1: move tig into Releases --- rev_news/draft/edition-1.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rev_news/draft/edition-1.md b/rev_news/draft/edition-1.md index d2d690ea4..8db9eae0f 100644 --- a/rev_news/draft/edition-1.md +++ b/rev_news/draft/edition-1.md @@ -274,6 +274,13 @@ Jeff King <>. The latest maintenance release Git v2.3.2 is now available at the usual places. ``` +* [Commandline GUI-tool *tig* version 1.2](http://article.gmane.org/gmane.comp.version-control.git/265298), March 11th: +``` +I just released version 2.1 of Tig which brings a lot of improvements to speed +up usage in large repositories such as the Linux kernel repo (see improvements +related to #310, #324, #350, and #368). Else this release brings minor +improvements across the board plus a fair amount of bug fixes. +``` * [NodeGit 0.3.0](https://github.com/nodegit/nodegit/releases/tag/v0.3.0), March 13th: ``` Updated to libgit2 v0.22.1. This release contains breaking API changes. Most @@ -300,7 +307,6 @@ have already been in the 'master' branch for some time. * Google Code [announced their shutdown](http://google-opensource.blogspot.de/2015/03/farewell-to-google-code.html), offering all remaining projects easy migration to Git/GitHub. * Nava Whiteford wrote a popular article on the [most common Git screwups/questions and solutions](http://41j.com/blog/2015/02/common-git-screwupsquestions-solutions/). * An older but related resource: [Flight rules for Git](https://github.com/k88hudson/git-flight-rules). -* Commandline GUI-tool *tig* [version 1.2 was released](http://article.gmane.org/gmane.comp.version-control.git/265298). * An [interview with Git book "Git in Practice" author, Mike McQuaid](http://www.infoq.com/articles/interview-Mike-McQuaid-git-practice). * Speaking of Git books, there's a new one on the way: [Git Essentials](https://www.packtpub.com/application-development/git-essentials). * And there's [a new video course out on mastering Git](https://www.packtpub.com/application-development/mastering-git-video). The author was just interviewed on.... From 64b4b93eccbd985dea38779e309787cba046ac44 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 25 Mar 2015 10:10:14 +0100 Subject: [PATCH 0054/3183] rev_news: publish edition 1 --- rev_news/{draft => }/edition-1.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/{draft => }/edition-1.md (100%) diff --git a/rev_news/draft/edition-1.md b/rev_news/edition-1.md similarity index 100% rename from rev_news/draft/edition-1.md rename to rev_news/edition-1.md From f26cba795dc17b5af2868bb1e4f942b7bdf55b1a Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 25 Mar 2015 10:17:10 +0100 Subject: [PATCH 0055/3183] rev_news: add draft for edition 2 --- rev_news/draft/edition-2.md | 52 +++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 rev_news/draft/edition-2.md diff --git a/rev_news/draft/edition-2.md b/rev_news/draft/edition-2.md new file mode 100644 index 000000000..bd385c754 --- /dev/null +++ b/rev_news/draft/edition-2.md @@ -0,0 +1,52 @@ + +## Git Rev News: Edition 2 (April ???, 2015) + +Welcome to the second edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +a digest of all things Git, written collaboratively +on [GitHub](https://github.com/git/git.github.io) by volunteers. + +Our goal is to aggregate and communicate +some of the activities on the [Git mailing list](mailto:git@vger.kernel.org) +in a format that the wider tech community can follow +and understand. In addition, we'll link to some of the interesting Git-related +articles, tools and projects we come across. + +This edition covers what happened during ???. + +You can contribute to the upcoming edition by sending [pull +requests](https://github.com/git/git.github.io/pulls) or opening +[issues](https://github.com/git/git.github.io/issues). + +## Discussions + +### General + + +### Reviews + + +### Support + + +## Misc Git News + +### Developers + + +### Events + +* [Git Merge 2015](http://git-merge.com/), The Conference for the Git +Community, will take place on April 8th & 9th in Paris, France, thanks +to GitHub and the sponsors. If you are a Git developer and need travel +or other assistance to go there, please contact Peff, aka +Jeff King <>. + +### Releases + + +### From outside the list + + +## Credits + +This edition of Git Rev News was curated by Christian Couder <> and Thomas Ferris Nicolaisen <> with help from ???. From 46910e5bf960729e183114ed8a4ef6c0fa58aacf Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 25 Mar 2015 10:32:14 +0100 Subject: [PATCH 0056/3183] rev_news edition 1: add proper header --- rev_news/edition-1.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rev_news/edition-1.md b/rev_news/edition-1.md index 8db9eae0f..de48b0690 100644 --- a/rev_news/edition-1.md +++ b/rev_news/edition-1.md @@ -1,3 +1,7 @@ +--- +layout: default +title: Git Rev News Edition 1 (March 25th, 2015) +--- ## Git Rev News: Edition 1 (March 25th, 2015) From 05ff797709a88fecd9501030d3bfe71f4712e9e6 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 25 Mar 2015 11:08:02 +0100 Subject: [PATCH 0057/3183] rev_news edition 1: add blank lines --- rev_news/edition-1.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rev_news/edition-1.md b/rev_news/edition-1.md index de48b0690..c1c197a40 100644 --- a/rev_news/edition-1.md +++ b/rev_news/edition-1.md @@ -274,31 +274,40 @@ Jeff King <>. ### Releases * [Git v.2.3.2](http://permalink.gmane.org/gmane.linux.kernel/1902789), March 6th. + ``` The latest maintenance release Git v2.3.2 is now available at the usual places. ``` + * [Commandline GUI-tool *tig* version 1.2](http://article.gmane.org/gmane.comp.version-control.git/265298), March 11th: + ``` I just released version 2.1 of Tig which brings a lot of improvements to speed up usage in large repositories such as the Linux kernel repo (see improvements related to #310, #324, #350, and #368). Else this release brings minor improvements across the board plus a fair amount of bug fixes. ``` + * [NodeGit 0.3.0](https://github.com/nodegit/nodegit/releases/tag/v0.3.0), March 13th: + ``` Updated to libgit2 v0.22.1. This release contains breaking API changes. Most noteworthy is the change to how certificate errors are handled during authentication. For more details check out the change log: http://www.nodegit.org/changelog/#v0-3-0 ``` + * [Git v.2.3.3](http://permalink.gmane.org/gmane.linux.kernel/1908634), March 14th: + ``` The latest maintenance release Git v2.3.3 is now available at the usual places. It is comprised of 26 non-merge commits since v2.3.2, contributed by 11 people, 1 of which is a new contributor. ``` + * [Git v2.3.4](http://permalink.gmane.org/gmane.linux.kernel/1915412), March 23rd: + ``` The latest maintenance release Git v2.3.4 is now available at the usual places. It is comprised of 22 non-merge commits since v2.3.3, From f37b4046db5609e37ff467fe536c40bb01e22ebd Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 25 Mar 2015 21:55:15 +0100 Subject: [PATCH 0058/3183] rev_news: improve outline - Rename the "Outside the list" to "Other news" - Rename "Discussions" to "From the mailing list" --- rev_news/draft/edition-2.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/rev_news/draft/edition-2.md b/rev_news/draft/edition-2.md index bd385c754..57b21599d 100644 --- a/rev_news/draft/edition-2.md +++ b/rev_news/draft/edition-2.md @@ -17,22 +17,18 @@ You can contribute to the upcoming edition by sending [pull requests](https://github.com/git/git.github.io/pulls) or opening [issues](https://github.com/git/git.github.io/issues). -## Discussions +## From the mailing list ### General - ### Reviews - ### Support - ## Misc Git News ### Developers - ### Events * [Git Merge 2015](http://git-merge.com/), The Conference for the Git @@ -44,7 +40,7 @@ Jeff King <>. ### Releases -### From outside the list +### Other news ## Credits From 7595b11ef21d050d58c12d940a9d07a44c719dca Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 25 Mar 2015 21:58:12 +0100 Subject: [PATCH 0059/3183] rev_news: turn Git Merge into a past event --- rev_news/draft/edition-2.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/rev_news/draft/edition-2.md b/rev_news/draft/edition-2.md index 57b21599d..94e2f9c17 100644 --- a/rev_news/draft/edition-2.md +++ b/rev_news/draft/edition-2.md @@ -32,10 +32,9 @@ requests](https://github.com/git/git.github.io/pulls) or opening ### Events * [Git Merge 2015](http://git-merge.com/), The Conference for the Git -Community, will take place on April 8th & 9th in Paris, France, thanks -to GitHub and the sponsors. If you are a Git developer and need travel -or other assistance to go there, please contact Peff, aka -Jeff King <>. +Community, took place on April 8th & 9th in Paris, France. The following +resources emerged from the event: + * TODO: Link to YouTube videos of recorded talks? ### Releases From 1496a8a20de1d1241aa2d15aa393d2b421936343 Mon Sep 17 00:00:00 2001 From: David Michael Barr Date: Thu, 26 Mar 2015 10:46:32 +0900 Subject: [PATCH 0060/3183] rev news edition 1: fix typo in tig 2.1 link The link text for tig 2.1 announcement has the version number transposed. Align it with the linked content. Signed-off-by: David Michael Barr --- rev_news/edition-1.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/edition-1.md b/rev_news/edition-1.md index c1c197a40..57dcb3685 100644 --- a/rev_news/edition-1.md +++ b/rev_news/edition-1.md @@ -280,7 +280,7 @@ The latest maintenance release Git v2.3.2 is now available at the usual places. ``` -* [Commandline GUI-tool *tig* version 1.2](http://article.gmane.org/gmane.comp.version-control.git/265298), March 11th: +* [Commandline GUI-tool *tig* version 2.1](http://article.gmane.org/gmane.comp.version-control.git/265298), March 11th: ``` I just released version 2.1 of Tig which brings a lot of improvements to speed From 95756224aa1cb03b96c99a0850da77961351beeb Mon Sep 17 00:00:00 2001 From: Jeff King Date: Fri, 27 Mar 2015 04:48:41 -0400 Subject: [PATCH 0061/3183] rev_news: redirect rev_news/ to current edition This makes https://git.github.io/rev_news/ do something sensible (as opposed to giving a 404). An obvious alternative would be to just have an index page that links to the editions in reverse chronological order. This `redirect_from` will need to be updated manually as new editions are published. --- _config.yml | 2 ++ rev_news/edition-1.md | 1 + 2 files changed, 3 insertions(+) diff --git a/_config.yml b/_config.yml index c4884faf5..6ba2d9cd1 100644 --- a/_config.yml +++ b/_config.yml @@ -1,2 +1,4 @@ name: Git Developer Pages markdown: redcarpet +gems: + - jekyll-redirect-from diff --git a/rev_news/edition-1.md b/rev_news/edition-1.md index c1c197a40..d17f3ea22 100644 --- a/rev_news/edition-1.md +++ b/rev_news/edition-1.md @@ -1,6 +1,7 @@ --- layout: default title: Git Rev News Edition 1 (March 25th, 2015) +redirect_from: "/rev_news/" --- ## Git Rev News: Edition 1 (March 25th, 2015) From 6cd23a9aed0e427f20cbd15081450ba0d19f811c Mon Sep 17 00:00:00 2001 From: Ryuichi Okumura Date: Sun, 29 Mar 2015 21:56:20 +0900 Subject: [PATCH 0062/3183] Fix wrong link to the about page --- _includes/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/navbar.html b/_includes/navbar.html index c457cbf8d..5b3769b89 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -1,7 +1,7 @@