From 89995c4ec49c0376a166cd6b130b46af4791b8c9 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Wed, 23 Mar 2016 13:37:14 +0100 Subject: [PATCH 0001/2664] SoC: heads-up at the beginning of 'About applying' section The page is titled "ideas" and some people may skip the introduction thinking this is *only* an ideas page. --- SoC-2016-Ideas.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SoC-2016-Ideas.md b/SoC-2016-Ideas.md index f0c362311d..e5101ae535 100644 --- a/SoC-2016-Ideas.md +++ b/SoC-2016-Ideas.md @@ -7,6 +7,9 @@ This is the idea page for Summer of Code 2016 for Git and libgit2. ## About applying for SoC with the Git project +*Please read this section completely before reading the idea list + below.* + It is required that students who want to apply to the Git project for the Summer of Code 2016 complete a tiny, code-related "microproject" as part of their application. Please refer to our From bd6de04ede78ae9e887a9c200ab5387f53c0f469 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Wed, 23 Mar 2016 13:37:56 +0100 Subject: [PATCH 0002/2664] SoC: add paragraph about what "good application" is The most important is the link to the official manual, but let's add a reminder ... --- SoC-2016-Ideas.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/SoC-2016-Ideas.md b/SoC-2016-Ideas.md index e5101ae535..baffd8973a 100644 --- a/SoC-2016-Ideas.md +++ b/SoC-2016-Ideas.md @@ -19,6 +19,16 @@ way for us to get experience with applicants, but it will also help applicants become familiar with Git's development and submission process. +A complete GSoC application should include a presentation of yourself +(include any argument that may convince mentors that you are able to +complete the project) and detailed explanations about your project. +Ideas below are just ... ideas! The list is not exhaustive, and more +importantly each idea only includes a summary of what is to be done. +An application must include detailed plans on the design, timeline ... +A typical application takes several pages. You should already have read +[the GSoC Student Guide](http://write.flossmanuals.net/gsocstudentguide/writing-a-proposal/) +by now, but re-read it if needed. + 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 From 07a500e72e513f5247e1e2940f3529a74e2bb000 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Wed, 23 Mar 2016 13:38:42 +0100 Subject: [PATCH 0003/2664] SoC: add summary of things to be done --- SoC-2016-Ideas.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/SoC-2016-Ideas.md b/SoC-2016-Ideas.md index baffd8973a..938beefe07 100644 --- a/SoC-2016-Ideas.md +++ b/SoC-2016-Ideas.md @@ -46,9 +46,20 @@ your microproject in your application (e.g. linking to participate in the review of other patches, then you may also include links to discussions that would support your application. -Students are strongly encourraged to send drafts of their proposal on +Students must send drafts of their proposal on the mailing-list before submitting it officially to GSoC to get -feedback from the community. +feedback from the community. They are strongly encourraged to publish a +draft on the official GSoC website *and* post it to the mailing list +for discussion. + +In summary, all applicants must (not necessarily in this order): + +* Complete a [microproject](http://git.github.io/SoC-2016-Microprojects). + +* Write a detailed application explaining their project. + +* Discuss their project by posting drafts of their application on the + mailing-list long before the deadline. ## Note about the number of slots From 4ba9c89ad3dd06df5eeb31c419bdc1321f363642 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 25 Mar 2016 18:19:20 +0100 Subject: [PATCH 0004/2664] SoC: add some paragraphs about Git development process --- SoC-2016-Ideas.md | 19 ++++++++++++++----- SoC-2016-Microprojects.md | 12 ++++++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/SoC-2016-Ideas.md b/SoC-2016-Ideas.md index 938beefe07..03651463a4 100644 --- a/SoC-2016-Ideas.md +++ b/SoC-2016-Ideas.md @@ -46,11 +46,20 @@ your microproject in your application (e.g. linking to participate in the review of other patches, then you may also include links to discussions that would support your application. -Students must send drafts of their proposal on -the mailing-list before submitting it officially to GSoC to get -feedback from the community. They are strongly encourraged to publish a -draft on the official GSoC website *and* post it to the mailing list -for discussion. +Students must send drafts of their proposal on the mailing-list before +submitting it officially to GSoC to get feedback from the +community. They are strongly encourraged to publish a draft on the +official GSoC website *and* post it to the mailing list for +discussion. + +Getting your proposal right can follow the same process as usual patch +submission for Git, as described in the +[microprojects](http://git.github.io/SoC-2016-Microprojects) page and +in `Documentation/SubmittingPatches` in Git's source code. It is also +expected that you will send several versions of your draft, responding +to comments on the list. If you are not sure about your proposal, you +can discuss that in the same email where you introduce yourself or in +separate emails. Please use "[GSoC]" at the beginning of such emails. In summary, all applicants must (not necessarily in this order): diff --git a/SoC-2016-Microprojects.md b/SoC-2016-Microprojects.md index f14b866865..8434eb85f6 100644 --- a/SoC-2016-Microprojects.md +++ b/SoC-2016-Microprojects.md @@ -19,6 +19,18 @@ libgit2 list of projects](https://github.com/libgit2/libgit2/blob/master/PROJECTS.md) rather than the list below.* +Git development is based on sending successive versions of patches or +patch series to the mailing list until they are considered good and +correct by the reviewers and Junio Hamano, the maintainer, who will +merge them. This process usually takes quite some time. By sending +drafts of your microproject patches to the +mailing list long before the deadline, you can show us that you are +willing and able to work well using the Git development process. + +It is *expected* that what you send will need several rounds of +reviews and discussions. If you are not sure at all about a patch you can +put "[RFC/PATCH]" at the beginning of its subject. + Consider [a sample email thread](http://thread.gmane.org/gmane.comp.version-control.git/239068), which shows how a developer proposed a change and a patch to implement From 4847b2839e09fb82c2b027cafa898f5071d27e09 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 25 Mar 2016 18:44:15 +0100 Subject: [PATCH 0005/2664] SoC: add list about what should be in an application --- SoC-2016-Ideas.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/SoC-2016-Ideas.md b/SoC-2016-Ideas.md index 03651463a4..2449a10c4b 100644 --- a/SoC-2016-Ideas.md +++ b/SoC-2016-Ideas.md @@ -70,6 +70,27 @@ In summary, all applicants must (not necessarily in this order): * Discuss their project by posting drafts of their application on the mailing-list long before the deadline. +In your application, it is a good idea to: + +* Include link(s) to the mailing-list discussion(s) related to the + project you chose in your application, for example previous + discussions or patch series about the topic. There might be + interesting discussions about the topics that are several year old. + It is also a good idea to summarize them. + +* Include link(s) to the mailing-list discussion(s) related to the + previous drafts of your application itself. + +* Include link(s) to the mailing-list discussion(s) related to your + microproject. + +* Include what is suggested in + [the GSoC Student Guide](http://write.flossmanuals.net/gsocstudentguide/writing-a-proposal/) + +([gmane](http://news.gmane.org/gmane.comp.version-control.git) can be +used for searching the mailing list and linking to previous +discussions.) + ## Note about the number of slots In 2016, the Git organization has very limited mentoring capacity. From e7ef89c656f22b60e4d86b976edd66cd35f3b574 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 7 Apr 2016 16:19:19 -0400 Subject: [PATCH 0006/2664] rn-5: fix bad rendering in published edition --- _posts/2015-07-08-edition-5.markdown | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/_posts/2015-07-08-edition-5.markdown b/_posts/2015-07-08-edition-5.markdown index 95207e6aaf..2c098ff4f9 100644 --- a/_posts/2015-07-08-edition-5.markdown +++ b/_posts/2015-07-08-edition-5.markdown @@ -77,11 +77,11 @@ instead incorrectly checkout `HEAD~2` at ``. The second version also introduces convenience enhancements. In particular, the `` in `git worktree add `, is now optional. When omitted, a new branch is created automatically based upon -``, as if `-b $(basename )` had been provided (where `-b -` creates a new branch). For example, given `git worktree add -../hotfix`, a new branch named *hotfix* is created and checked out into new -worktree `../hotfix`, as if `git worktree -b hotfix ../hotfix HEAD` had -been specified. +``, as if `-b $(basename )` had been provided (where +`-b ` creates a new branch). For example, given +`git worktree add ../hotfix`, a new branch named *hotfix* is created and +checked out into new worktree `../hotfix`, as if +`git worktree -b hotfix ../hotfix HEAD` had been specified. Finally, the question was [raised](http://article.gmane.org/gmane.comp.version-control.git/273107) From 7e26f95dffff7f7e8955b2ddaeb617d5e96ee41a Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 14 Apr 2016 22:21:32 +0200 Subject: [PATCH 0007/2664] rn-14: set publication date to April 20th --- rev_news/drafts/edition-14.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rev_news/drafts/edition-14.md b/rev_news/drafts/edition-14.md index 2956c31d66..5b7c3e34da 100644 --- a/rev_news/drafts/edition-14.md +++ b/rev_news/drafts/edition-14.md @@ -1,19 +1,21 @@ --- -title: Git Rev News Edition 14 (XXX, 2016) +title: Git Rev News Edition 14 (April 20th, 2016) layout: default -date: 2016-04-13 21:06:51 +0100 +date: 2016-04-20 21:06:51 +0100 author: chriscool categories: [news] navbar: false --- -## Git Rev News: Edition 14 (XXX, 2016) +## Git Rev News: Edition 14 (April 20th, 2016) Welcome to the 14th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). -This edition covers what happened during the month of April 2016. +This edition covers what happened during the month of March 2016 and +also what happened at the Git Contributor Summit on April 4 2016 and +at the Git Merge conference on April 5 2016. ## Discussions From 7bad32343786e04e1a5018869bcef5a9282fe230 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 14 Apr 2016 23:51:42 +0200 Subject: [PATCH 0008/2664] rn-14: add article Contributor Summit part 1 --- rev_news/drafts/edition-14.md | 81 ++++++++++++++++++++++++++++++++--- 1 file changed, 76 insertions(+), 5 deletions(-) diff --git a/rev_news/drafts/edition-14.md b/rev_news/drafts/edition-14.md index 5b7c3e34da..70868794a0 100644 --- a/rev_news/drafts/edition-14.md +++ b/rev_news/drafts/edition-14.md @@ -19,13 +19,84 @@ at the Git Merge conference on April 5 2016. ## Discussions - - +* Discussions at the Git Contributor Summit, part 1 + +The Git Contributor Summit happened on April 4th at the panoramic +rooftop bar of +[the citizenM hotel in New York City, USA](https://www.citizenm.com/destinations/new-york/new-york-times-square). +The whole bar had been reserved by GitHub for the Summit from 10am to +4pm. + +Around 20 developers attended. Drinks were provided, and food was +served during the lunch break. Afterwards GitHub also invited +attendants to a diner at a nearby Italian restaurant. + +As usual it was an unconference. Attendants interested to discuss a +topic wrote it on a board or voted on the board for it. + +The topics that attracted most votes were about performance on big +repositories. + +First it was said that it is unfortunate that the performance of many +git commands, like for example `git log`, depends linearly on the +number of refs in the repository. + +One possible solution to this problem would be to use some kind of +binary search algorithm to looks up refs, but it's not so easy because +replace refs in 'refs/replace/' should anyway all be read and also +because with the current backend some stat(2) calls are needed to +check if there are loose refs. + +This problem should at least partially be solved with the current work +going on to implement other ref backends, especially a +[lmdb](http://symas.com/mdb/) based one. + +From there the discussion switched to the case sensitiveness of ref +names and the different problems created by having ref names that +should also be proper filenames: slow filesystems like NTFS, unicode +normalizing filesystems like HFS+, file/directory collisions, reflog +deletion... + +It was then mentioned that the tree object lookup could be speed up, +but it would require a more efficient packfile format. + +The current effort to implement an `index-helper` daemon to speed up +index reading was also described. + +Then some time was spent discussing large objects. There are objects +that can be stored locally, other that cannot. This means that for +example doing something like rsync that manages chunk of files might +not always be possible. + +About Git LFS that is now offered by at least GitHub and Microsoft, +there are still a number of problems with it from a user +perspective. First it is not shipped with Git. Another one is that it +is not easy to know which files should go into it. + +Also it looks like the filters that are used by git LFS to trigger big +file downloads are executed sequencially which is not good for +performance. + +This made people mention potential problems with parallelizing +`git checkout`. + +One possibility to improve on Git LFS would be to create another kind +of backend for git objects that would be optimized for large files and +would sit along loose objects and packfiles. + +Then the subject switched to possible ways to speed up git status. The +`index-helper` daemon effort was described again, as it can use +[the watchman library](https://facebook.github.io/watchman/) to +efficiently monitor the working tree for changes. The watchman service +must be run manually for now though. And running daemons on Windows +might require some admin rights. + +The recently merged effort on improving the untracked cache in the +index was also mentionned. + + From bd53281a0869bd1e7a55b7c4adf7345c743f8a17 Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Mon, 18 Apr 2016 10:29:12 +1000 Subject: [PATCH 0011/2664] Fix some small typos and make some grammar changes --- rev_news/drafts/edition-14.md | 101 +++++++++++++++++----------------- 1 file changed, 50 insertions(+), 51 deletions(-) diff --git a/rev_news/drafts/edition-14.md b/rev_news/drafts/edition-14.md index a2183e72a5..4b0a05344a 100644 --- a/rev_news/drafts/edition-14.md +++ b/rev_news/drafts/edition-14.md @@ -31,10 +31,10 @@ The whole bar had been reserved by GitHub for the Summit from 10am to Around 20 developers attended. Drinks were provided, and food was served during the lunch break. Afterwards GitHub also invited -attendants to a diner at a nearby Italian restaurant. +attendants to a dinner at a nearby Italian restaurant. -As usual it was an unconference. Attendants interested to discuss a -topic wrote it on a board or voted on the board for it. +As usual it was an unconference. Attendants interested in discussing a +topic wrote it on a board, where everyone could vote for it. The topics that attracted most votes were about performance on big repositories. @@ -44,39 +44,38 @@ git commands, like for example `git log`, depends linearly on the number of refs in the repository. One possible solution to this problem would be to use some kind of -binary search algorithm to looks up refs, but it's not so easy because -replace refs in 'refs/replace/' should anyway all be read and also -because with the current backend some stat(2) calls are needed to -check if there are loose refs. +binary search algorithm to look up refs. Unfortunately that is not easy, as +replaced refs in 'refs/replace/' must all be read, and additionally the current implementation +of the backend requires some stat(2) calls to check if there are any loose refs. This problem should at least partially be solved with the current work -going on to implement other ref backends, especially a +going on to implement additional ref backends, especially a [lmdb](http://symas.com/mdb/) based one. From there the discussion switched to the case sensitiveness of ref -names and the different problems created by having ref names that +names, and the different problems created by having ref names that should also be proper filenames: slow filesystems like NTFS, unicode normalizing filesystems like HFS+, file/directory collisions, reflog -deletion... +deletion, and more. -It was then mentioned that the tree object lookup could be speed up, -but it would require a more efficient packfile format. +It was also mentioned that the tree object lookup could be sped up, +but that it would require a more efficient packfile format. The current effort to implement an `index-helper` daemon to speed up index reading was also described. -Then some time was spent discussing large objects. There are objects -that can be stored locally, other that cannot. This means that for -example doing something like rsync that manages chunk of files might -not always be possible. +Then some time was spent discussing large objects. Some objects +are able to be stored locally, while others are not. This means that +doing something similar to rsync, where it manages chunks of files, +might not always be possible. -About Git LFS that is now offered by at least GitHub and Microsoft, +Git LFS is now offered by at least GitHub and Microsoft, however there are still a number of problems with it from a user -perspective. First it is not shipped with Git. Another one is that it -is not easy to know which files should go into it. +perspective. For example, it is not shipped with Git, and it is not always +easy to know which files should go into it. -Also it looks like the filters that are used by git LFS to trigger big -file downloads are executed sequencially which is not good for +It also looks like the filters used by Git LFS to trigger big +file downloads are executed sequentially, which is not good for performance. This made people mention potential problems with parallelizing @@ -84,13 +83,13 @@ This made people mention potential problems with parallelizing One possibility to improve on Git LFS would be to create another kind of backend for git objects that would be optimized for large files and -would sit along loose objects and packfiles. +would sit alongside loose objects and packfiles. -Then the subject switched to possible ways to speed up git status. The +The subject next switched to possible ways of speeding up `git status`. The `index-helper` daemon effort was described again, as it can use [the watchman library](https://facebook.github.io/watchman/) to -efficiently monitor the working tree for changes. The watchman service -must be run manually for now though. And running daemons on Windows +efficiently monitor the working tree for changes. Unfortunately, the watchman service +must be run manually for now, and running daemons on Windows might require some admin rights. The recently merged effort on improving the untracked cache in the @@ -117,65 +116,65 @@ He is the maintainer of the Kernel '-stable' branches and of many subsystems like USB. He said that the Linux Kernel is made of more than 21 million lines of -code in more than 53 000 files. Everything is in the tree. Driver are -one third of the size. Nearly 4000 developers and around 400 companies +code, in more than 53 000 files. Everything is in the tree, and drivers account +for around one third of the size. Nearly 4000 developers and around 400 companies are involved. This makes the Linux Kernel the largest software project ever. -Around 10 000 lines are added, 5300 lines are removed and 1800 lines +Around 10 000 lines are added, 5300 lines are removed, and 1800 lines are modified, everyday! That's on average 7.8 changes per hour accross the whole tree with 5% -in the core, 10% in the networking subsystem and 55% in the drivers. +in the core, 10% in the networking subsystem, and 55% in the drivers. -This goes against any previously thought methodology for stable -software. And things are going faster and faster. +This goes against all previous methodologies for stable +software development, and things are only getting faster and faster. Things are going so fast that it costs money to keep your code outside the kernel. -There is a new release every 2.5 months, so if your code get rejected +There is a new release every 2.5 months, so if your code is rejected you have to wait 2 months before it can be in the next release. This is very predictable. The release cycle is made of a two week long "merge window" and then -some "rc" releases one per week. During the "merge window", code is +some "rc" releases - one per week. During the "merge window", code is merged from subsystem maintainers. The "rc" releases, "rc-1", "rc-2", ... , "rc-7" are bug fixes only. Once all major bugs and regressions -are fixed a release is made and the cyce starts over with a ne merge +are fixed a release is made and the cycle starts over with a new merge window. For "stable" kernels that Greg maintains, they are forked from Linux releases. Commits have to go in Linus' tree first before Greg will -accept them. It should be the identical patch as what is in Linus' -tree and it should be bug fixes only or new device ids. The Linux +accept them. It should be the same identical patch as what is in Linus' +tree, and it should only contain bug fixes or new device ids. The Linux distributions usually run from "stable" kernels. -The "longterm" kernel is maintained for 2 years. Current "longterm" +The "longterm" kernels are maintained for 2 years. Current "longterm" kernels are 3.14, 4.1 and 4.4. -This works well for many companies. But sometimes maintaining a kernel +This works well for many companies, but sometimes maintaining a kernel for 2 years is not enough. Japan is converting all its infrastructure -to Linux and people want some kernels maintained for 20 years. +to Linux, and people want some kernels maintained for 20 years. The patches sent for inclusion into the Kernel should be standalone. -None of them should break the build. One half to one third of the -patches get accepted. They should be obvious, broken down in the -smallest possible patches and every change should be correct. +None of them should break the build. Each patch set should be obvious, +broken down into the smallest reasonable patches, and every change +should be correct. One half to one third of submitted patches get accepted. -This puts work on the developer's shoulders. But that's on purpose -because there are much more developers than maintainers. There are -1000 maintainers but only around 700 are active. +This puts most of the work on the developer's shoulders. That's on purpose, +as there are many more developers than maintainers. There are +1000 maintainers, but only around 700 are active. To reach the maintainers, patches should be sent to the relevant mailing list, like the usb mailing list or the scsi mailing list. Andrew Morton reads the lkml mailing list. -The email format should be plain text. It's old school but works very +The email format should be plain text. It's old school but works very, very well. The Developer's Certificate of Origin (DCO) is used to ensure that people have the right to submit a patch. This is the same -as what Git does. +process that Git uses. After a patch has been reviewed by a file or driver maintainer, the maintainer will add his own "Signed-off-by" and will send it to a @@ -190,13 +189,13 @@ built and boot tested on different platforms. Andrew Morton uses quilt to maintain his "-mm" kernels made from patches picked by himself from the lkml mailing list or elsewhere. -A couple years ago Kernel developers realized that nobody actually +A couple of years ago, Kernel developers realized that nobody actually tested the kernel. -There is now a 0 day bot that run tests and static analysis tools, +To address this, there is now a "0 day bot" that run tests and static analysis tools, like coccinelle or sparse, automatically on all the kernel trees. It -tests all the commits. It has a script that writes patches for common -problems. The bot also picks patches from mailing lists to test them. +tests every comment, and has a script that writes patches for common +problems. The bot also picks patches from the mailing lists to test. When a new merge window opens, the subsystem maintainers and Andrew Morton send what they think is ready to Linus, so he can merge it. The From e2f2cd60f6b40c525b3923f60e16f20822908556 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 18 Apr 2016 06:15:07 +0200 Subject: [PATCH 0012/2664] rn-14: reference previous editions about lmdb ref backend This is to address: https://github.com/git/git.github.io/commit/7bad32343786e04e1a5018869bcef5a9282fe230#commitcomment-17136423 --- rev_news/drafts/edition-14.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rev_news/drafts/edition-14.md b/rev_news/drafts/edition-14.md index a2183e72a5..5113b23479 100644 --- a/rev_news/drafts/edition-14.md +++ b/rev_news/drafts/edition-14.md @@ -53,6 +53,10 @@ This problem should at least partially be solved with the current work going on to implement other ref backends, especially a [lmdb](http://symas.com/mdb/) based one. +(This work on an lmdb based ref backend has been reported on in +[Git Rev News edition 12](http://git.github.io/rev_news/2016/02/10/edition-12/) and +[Git Rev News edition 7](http://git.github.io/rev_news/2015/09/09/edition-7/).) + From there the discussion switched to the case sensitiveness of ref names and the different problems created by having ref names that should also be proper filenames: slow filesystems like NTFS, unicode From afa91f1fd859393c4213b2614cafd0a7a71d1a0b Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 18 Apr 2016 06:25:59 +0200 Subject: [PATCH 0013/2664] rn-14: add reference to 0 day bot discussion --- rev_news/drafts/edition-14.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/rev_news/drafts/edition-14.md b/rev_news/drafts/edition-14.md index 5113b23479..997d933c88 100644 --- a/rev_news/drafts/edition-14.md +++ b/rev_news/drafts/edition-14.md @@ -208,6 +208,11 @@ rule is that what is sent to Linus should have already been in linux-next. 10 000 to 11 000 patches are usually merged in the 2 week long merge window. +Following Greg's talk, Stefan Beller asked on the mailing list if Greg +could put the Git developers in touch with the 0 day bot developers +and [a discussion started](http://thread.gmane.org/gmane.comp.version-control.git/291242/) +about how the 0 day bot could be used. + + +## Developer Spotlight: Johannes Sixt + +* Who are you, and what do you do? + +I am a seasoned software engineer. Professionally, I work on Windows +most of the time and develop software in C++. At home, I am operating +only Linux and contribute to various Open Source projects. Most +prominently, KDbg (http://www.kdbg.org/), a GUI around the debugger +GDB, is my child. + +* What would you name your most important contribution to Git? + +I was the first one to present a working and usable Git on Windows. By +this I mean git.exe, the program, not the package Git for Windows +(which is another great achievement, but it is not mine). Of course, +it was possible to operate Git on Windows using Cygwin before my +contribution. But the Cygwin runtime is such a thick layer between the +POSIX and Windows APIs that file operations are very, very slow. My +goal was to make git.exe a native Windows program and considerably +faster. And that is it today when we talk about "Git for Windows". + +* What are you doing on the Git project these days, and why? + +In our software shop, we use Git a lot. That is sufficient motivation +to keep an eye on its development. These days I'm doing mostly +janitory work to keep Git working on Windows. + +* If you could get a team of expert developers to work full time on + something in Git for a full year, what would it be? + +Port Git to C++. When done right, there would not be any worries about +memory leaks, chatty error messages, extra function parameters to +choose whether a library function should return or die on error. Code +could be written much shorter. Librarification would be achieved in a +natural way. Subsequently, turning shell scripts into built-in +commands would become much easier. For example, you wouldn't even have +to ask "does the git-apply machinery clean up after itself +sufficiently so that we can call it multiple times from one program?" +(Yes, it would do so automatically.) + +* If you could remove something from Git without worrying about + backwards compatibility, what would it be? + +I have learned to live with Git's quirks. Therefore, it's difficult to +find something that is really an obstacle for me. But with an eye on +newcomers, I think I would pick the term "cache" and its variants as a +candidate for removal. + +(Oh, it looks like I'm in good company of Matthieu Moy, who thinks likewise.) + +* What is your favourite Git-related tool/library, outside of Git itself? + +I think I work exclusively with git-core tools (if you count in +git-gui and gitk). The closest that comes to mind that are both +"related" and "favourite" are Meld and Winmerge when driven by +git-difftool and git-mergetool. + From 636181bdc0581db6450e1f36374df75a1d665713 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Apr 2016 15:49:54 +0200 Subject: [PATCH 0019/2664] rn-14: add Hannes among the helpers --- rev_news/drafts/edition-14.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-14.md b/rev_news/drafts/edition-14.md index 54d370e91a..7a03b94215 100644 --- a/rev_news/drafts/edition-14.md +++ b/rev_news/drafts/edition-14.md @@ -330,4 +330,4 @@ __Git tools and sites__ This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from XXX. +with help from Johannes Sixt. From c0fb7eb394970eed36f5b57368c37cb53c4a114c Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Apr 2016 15:51:01 +0200 Subject: [PATCH 0020/2664] rn-14: adjusting time stamp --- rev_news/drafts/edition-14.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-14.md b/rev_news/drafts/edition-14.md index 7a03b94215..ca90b90814 100644 --- a/rev_news/drafts/edition-14.md +++ b/rev_news/drafts/edition-14.md @@ -1,7 +1,7 @@ --- title: Git Rev News Edition 14 (April 20th, 2016) layout: default -date: 2016-04-20 21:06:51 +0100 +date: 2016-04-20 15:06:51 +0100 author: chriscool categories: [news] navbar: false From 0f477ddc7a269580ae498e616c17107bdf0c493e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Apr 2016 15:52:56 +0200 Subject: [PATCH 0021/2664] Publish Git Rev News edition 14 in _posts/ --- .../drafts/edition-14.md => _posts/2016-04-20-edition-14.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-14.md => _posts/2016-04-20-edition-14.markdown (100%) diff --git a/rev_news/drafts/edition-14.md b/_posts/2016-04-20-edition-14.markdown similarity index 100% rename from rev_news/drafts/edition-14.md rename to _posts/2016-04-20-edition-14.markdown From 324cd852694f81986be1e2a778af593813b422db Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Apr 2016 15:55:54 +0200 Subject: [PATCH 0022/2664] rn-14: add Dscho and Cogito among the helpers --- _posts/2016-04-20-edition-14.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2016-04-20-edition-14.markdown b/_posts/2016-04-20-edition-14.markdown index ca90b90814..4a36c99670 100644 --- a/_posts/2016-04-20-edition-14.markdown +++ b/_posts/2016-04-20-edition-14.markdown @@ -330,4 +330,4 @@ __Git tools and sites__ This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from Johannes Sixt. +with help from Johannes Sixt, Andrew Ardill and Johannes Schindelin. From 5d2c072f26e72e7a5d35f67c71120361558adea4 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 10 Feb 2016 13:16:34 +0100 Subject: [PATCH 0023/2664] Add draft for rn-15 --- rev_news/drafts/edition-15.md | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 rev_news/drafts/edition-15.md diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md new file mode 100644 index 0000000000..c1d5ad292b --- /dev/null +++ b/rev_news/drafts/edition-15.md @@ -0,0 +1,50 @@ +--- +title: Git Rev News Edition 15 (XXX, 2016) +layout: default +date: 2016-05-13 21:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 15 (XXX, 2016) + +Welcome to the 14th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). + +This edition covers what happened during the month of April 2016. + +## Discussions + + + + + + + +## Releases + + +## Other News + +__Various__ + + +__Light reading__ + + +__Git tools and sites__ + + +## Credits + +This edition of Git Rev News was curated by Christian Couder <>, +Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, +with help from XXX. From c056172a1a7ed86da52a1cc89eb80ecb92fee4dc Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Apr 2016 16:10:32 +0200 Subject: [PATCH 0024/2664] rn-14: fix metadata --- _posts/2016-04-20-edition-14.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2016-04-20-edition-14.markdown b/_posts/2016-04-20-edition-14.markdown index 4a36c99670..32a28ecd65 100644 --- a/_posts/2016-04-20-edition-14.markdown +++ b/_posts/2016-04-20-edition-14.markdown @@ -1,7 +1,7 @@ --- title: Git Rev News Edition 14 (April 20th, 2016) layout: default -date: 2016-04-20 15:06:51 +0100 +date: 2016-04-20 14:06:51 +0100 author: chriscool categories: [news] navbar: false From 67385e96f89db4e7c1cc4475f98ca1379fec11ba Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 27 Apr 2016 22:57:19 +0200 Subject: [PATCH 0025/2664] SoC-2016-Ideas: tell that we accept at most 2 students --- SoC-2016-Ideas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoC-2016-Ideas.md b/SoC-2016-Ideas.md index 2449a10c4b..7d849dc947 100644 --- a/SoC-2016-Ideas.md +++ b/SoC-2016-Ideas.md @@ -94,7 +94,7 @@ discussions.) ## Note about the number of slots In 2016, the Git organization has very limited mentoring capacity. -We will probably be able to accept 2 students only this year. +These days we usually accept between 0 and 2 students per year. ## Summer of code main project ideas From b062de5b87aa231723570542490895d096377b0e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 6 May 2016 00:47:13 +0200 Subject: [PATCH 0026/2664] rn-15: fix publish date to May 11 --- rev_news/drafts/edition-15.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index c1d5ad292b..2bfa37d2c4 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -1,15 +1,15 @@ --- -title: Git Rev News Edition 15 (XXX, 2016) +title: Git Rev News Edition 15 (May 11th, 2016) layout: default -date: 2016-05-13 21:06:51 +0100 +date: 2016-05-11 21:06:51 +0100 author: chriscool categories: [news] navbar: false --- -## Git Rev News: Edition 15 (XXX, 2016) +## Git Rev News: Edition 15 (May 11th, 2016) -Welcome to the 14th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +Welcome to the 15th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). From f48db4a66288f17eeab335ea2ba9a29ec6303b11 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 6 May 2016 00:47:59 +0200 Subject: [PATCH 0027/2664] rn-15: add draft of Contributor Summit part 2 --- rev_news/drafts/edition-15.md | 37 +++++++++++++++++++++++++++++++++-- 1 file changed, 35 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index 2bfa37d2c4..ad9533502f 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -17,9 +17,42 @@ This edition covers what happened during the month of April 2016. ## Discussions - + +* Discussions at the Git Contributor Summit, part 2, about misc topics + +At the Git Contributor Summit on April 4th, just after the lunch +break, the state of the participation of the Git project in the Google +Summer of Code (GSoC) and Outreachy was briefly mentioned, then Jeff +King, alias Peff, talked about the state of the Git project as part of +the [Software Freedom Conservancy (SFC)](https://sfconservancy.org/). + +Git is one of the SFC Member Projects. The SFC manages the legal and +administrative aspects of the Git project. The SFC also manages Git's +money, which amounts to around $20000. This money comes mostly from +donations made on git-scm.org, GSoC mentor stipends and book +royalties. The money has been used in the past to pay for some +developers to travel to conferences like Git Merge. It may be used in +the future to pay Outreachy student stipends. + +The governance of the Git project as part of the SFC is in the hands +of Junio Hamano, Shawn Pearce and Jeff King. The main activity of the +governance consists in handling trademark issues related to the "Git" +trademark that the project owns. + +There are a number of projects who call themselves Git XXX and the +trademark policy on git-scm.org is used to decide if those trademarks +are approved or not. + +Another activity is related to defending the license which is the +GPL. There have been some vendors who distributed Git with some +changes, but did not provide the source code of the Git version they +distributed. For now it has been possible to resolve these cases, but +it is not completely clear if some vendors currently fullfill all +their obligations. In case some developers who contributed to Git +wants to take a close look at what the vendors are doing, the SFC can +help them. + From 4a90095397c0bd791f4b7f449cc4a0d56a876ea4 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 8 May 2016 12:07:54 +0200 Subject: [PATCH 0032/2664] rn-15: add Sid's surname --- rev_news/drafts/edition-15.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index ff40ad39cb..8935e0e001 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -62,8 +62,8 @@ submitted on GitHub was also discussed at the same time. It appeared that it would be good to also be able to test pull requests on Windows machines but TravisCI doesn't support Windows -yet. To help on this GitLab CEO, Sytse Sijbrandij, offered to let the -project use GitLab CI which supports Linux, OSX and Windows. +yet. To help on this GitLab CEO, Sytse "Sid" Sijbrandij, offered to +let the project use GitLab CI which supports Linux, OSX and Windows. Various subjects were then discussed a bit, like case insensitive refnames and filenames, submodules and Git on Celph which is a file From 974033b65dd46a25027de7a5dbecdbfc40a59c77 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 8 May 2016 12:09:25 +0200 Subject: [PATCH 0033/2664] rn-15: add draft of article about git tricks --- rev_news/drafts/edition-15.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index 8935e0e001..59e07bc171 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -73,6 +73,34 @@ A mix of long time and quite new Git contributors, along with people from Git related projects and companies attended. The atmosphere was relaxed and informal. Overall it was a very pleasant event. +* [20 Tricks with Git and Shell](https://speakerdeck.com/nibalizer/20-tricks-with-git-and-bash) + +At the [Git Merge conference](http://git-merge.com/) on April 5th 2016 +at [New World Stages](http://newworldstages.com/) in New York City, +USA, Spencer Krum, who works for IBM in Portland and appears to be a +big fan of the +[SFC (Software Freedom Conservancy)](https://sfconservancy.org/), gave +an interesting and fast-paced presentation about some shell and Git +command line tricks. + +Some of the tricks he showed are available in his +['bash-tricks' GitHub repository](https://github.com/nibalizer/bash-tricks). + +The presentation started with simple shell aliases like `alias +sl='ls'` to cope with typos and `alias g='git'` to reduce typing, then +a bit more complex ones to avoid typing common arguments like `alias +gprom='git push origin master'` and `alias pydoc='python -m pydoc'`, +until validation aliases like: + +``` +alias yamlcheck='python -c "import sys, yaml as y; y.safe_load(open(sys.argv[1]))"' +``` + +Then Spencer told about customized prompts for git, filesystems or +tools, and about git config aliases. + + + * [GSoC 2016](http://thread.gmane.org/gmane.comp.version-control.git/292308/) This year only one student, Pranit Bauva, will participate in the From dcb092049875dc88ead233f3c14e5cbd01d19a97 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 8 May 2016 14:21:37 +0200 Subject: [PATCH 0034/2664] rn-15: finish article about git tricks --- rev_news/drafts/edition-15.md | 63 +++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index 59e07bc171..ec769ba633 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -96,10 +96,69 @@ until validation aliases like: alias yamlcheck='python -c "import sys, yaml as y; y.safe_load(open(sys.argv[1]))"' ``` -Then Spencer told about customized prompts for git, filesystems or -tools, and about git config aliases. +Then Spencer spoke about customized prompts for git, filesystems and +tools, and about git config aliases, for example: +``` +[alias] + sgrep = "!f() { git submodule foreach \"git grep '$1'; true \" + | grep -B 1 \"$1\"; }; f" +``` + +After that came functions. Some were general like: + +``` +# Get to the top of a git tree +cdp () { + + TEMP_PWD=`pwd` + while ! [ -d .git ]; do + cd .. + done + OLDPWD=$TEMP_PWD + +} +``` + +Others were related to Gerrit or GitHub: + +``` +# Check out a Pull request from github +function pr() { + id=$1 + if [ -z $id ]; then + echo "Need Pull request number as argument" + return 1 + fi + git fetch origin pull/${id}/head:pr_${id} + git checkout pr_${id} +} +``` + +In the end Spencer showed how to combine multiple small features to +get something interesting. First vim can be started at a given line by +giving the line in a +[num] argument, for example `vim +24`, then one +can get the previous command typed on the command line using +`history | tail -n 2 | head -1`, and finally one can use `git grep -n XXX` +to get a grep result from Git with a line number. + +These 3 small tricks can be used in the following big one: + +``` +# Have vim inspect command history +vim () { + last_command=$(history | tail -n 2 | head -n 1) + if [[ $last_command =~ 'git grep' ]] && [[ "$*" =~ :[0-9]+:$ ]]; then + line_number=$(echo $* | awk -F: '{print $(NF-1)}') + /usr/bin/vim +${line_number} ${*%:${line_number}:} + else + /usr/bin/vim "$@" + fi +} +``` +That makes vim open file "foo" at line "X" if one uses `vim foo:X` +just after having run `git grep`. * [GSoC 2016](http://thread.gmane.org/gmane.comp.version-control.git/292308/) From 14c3fb56418a690bf99eb2f46d5cf39503f4cdf0 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Sun, 8 May 2016 23:34:56 +0200 Subject: [PATCH 0035/2664] rn-15: add links and releases --- rev_news/drafts/edition-15.md | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index ec769ba633..2b7c985ea4 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -177,18 +177,41 @@ in shell. He will be mentored by Lars Schneider and Christian Couder. ## Releases +* [Git 2.8.2](http://article.gmane.org/gmane.comp.version-control.git/293059/) +* [Git for Windows 2.8.2](https://groups.google.com/d/msg/git-for-windows/-Jur6cdjMjE/m02wl_qCCQAJ) +* [libgit2/rugged v0.25.0b2](https://github.com/libgit2/rugged/releases/tag/v0.25.0b2) +* [libgit2/nodegit v0.13.0](https://github.com/nodegit/nodegit/releases/tag/v0.13.0) +* [JGit/EGit 4.3.1](http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg03139.html) +* [GitLab 8.7](https://about.gitlab.com/2016/04/22/gitlab-8-7-released/) and patches up to [8.7.3](https://about.gitlab.com/2016/05/06/gitlab-8-dot-7-dot-3-released/) ## Other News __Various__ - +* [Fun with a new feature in recent Git](https://git-blame.blogspot.de/2016/05/fun-with-new-feature-in-recent-git.html) by Junio C Hamano +* [4200 miles, 5GBs, 1 min: cloning with mirrors and Git LFS](http://blogs.atlassian.com/2016/04/bitbucket-data-center-smart-mirroring-with-git-lfs-support/) from Atlassian's Kelvin Yap +* [GitHub: Import repositories with large files](https://github.com/blog/2163-import-repositories-with-large-files), by Jonathan Hoyt +* [Git Tips, Tricks and Workflows](http://www.fullstackradio.com/41) from the Full Stack Radio podcast epsiode 41, featuring Jason McCreary +* [One Commit. One Change.](https://medium.com/@fagnerbrack/one-commit-one-change-3d10b10cebbf#.1zqmjhd8q) by Fagner Brack +* [Fast-Forward and parent reversal](http://dwim.me/2016/01/11/fast-foward-and-parent-reversal.html) by Carlos Martín Nieto +* An interesting way of collecting your Git tricks using the [Gingko App](https://gingkoapp.com/git-notes) +* [How to recover lost files added to Git but not committed](http://blog.plover.com/2016/04/16/) by Mark Dominus +* [An Effective Git And Org-Mode Based Workflow For Reproducible Research](https://hal.inria.fr/hal-01112795/document) (PDF) __Light reading__ +* [Git-101-tutorial](http://ianmiell.github.io/git-101-tutorial/) by Ian Miell +* [Go upgrade Xcode. Fix your git security hole.](http://rachelbythebay.com/w/2016/05/05/xcode/) +* [12 advanced Git commands I wish my co-workers would know](http://www.askaswiss.com/2016/01/12-useful-advanced-git-commands.html), by Michael Beyeler +* [Maintaining a consistent linear history for git...](http://devblog.nestoria.com/post/98892582763/maintaining-a-consistent-linear-history-for-git) by David Lowe of Nestoria +* [Shared repositories in Git](http://emi.gd/blog/git-submodules/) by Emilia Szymańska __Git tools and sites__ +* [GitJunction](http://gitjunction.com/) - a collection of Git tutorials +* [sobolevn/git-secret: A bash-tool to store your private data inside a git repository.](https://github.com/sobolevn/git-secret) +* [git-remote-dropbox](http://www.anishathalye.com/2015/08/19/git-remote-dropbox/) by Anish Athalye +* [anishathalye/git-remote-dropbox: bridge between Git and Dropbox](https://github.com/anishathalye/git-remote-dropbox) ## Credits From 68f51fd8b59ff1fc797b9d72600a1713460e053d Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Mon, 9 May 2016 11:53:28 +1000 Subject: [PATCH 0036/2664] Add link to part 1 of summit discussions --- rev_news/drafts/edition-15.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index 2b7c985ea4..7558c0512f 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -23,6 +23,8 @@ Git Merge conference on April 5 2016. * Discussions at the Git Contributor Summit, part 2, about misc topics +*Read part 1 in [Git Rev News Edition 14](http://git.github.io/rev_news/2016/04/20/edition-14/)* + At the Git Contributor Summit on April 4th, just after the lunch break, the state of the participation of the Git project in the Google Summer of Code (GSoC) and Outreachy was briefly mentioned, then Jeff From 16c6816ec6d1bf343c0b5ad9a8602496689cf9c9 Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Mon, 9 May 2016 12:04:56 +1000 Subject: [PATCH 0037/2664] Small grammar changes on summit discussions part 2 --- rev_news/drafts/edition-15.md | 44 +++++++++++++++++------------------ 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index 7558c0512f..b745efced2 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -27,52 +27,52 @@ Git Merge conference on April 5 2016. At the Git Contributor Summit on April 4th, just after the lunch break, the state of the participation of the Git project in the Google -Summer of Code (GSoC) and Outreachy was briefly mentioned, then Jeff -King, alias Peff, talked about the state of the Git project as part of +Summer of Code (GSoC) and Outreachy were briefly mentioned. Jeff King, +alias Peff, then talked about the state of the Git project as part of the [Software Freedom Conservancy (SFC)](https://sfconservancy.org/). Git is one of the SFC Member Projects. The SFC manages the legal and -administrative aspects of the Git project. The SFC also manages Git's +administrative aspects of the Git project, and also manages Git's money, which amounts to around $20000. This money comes mostly from -donations made on git-scm.org, GSoC mentor stipends and book +donations made on git-scm.org, GSoC mentor stipends, and book royalties. The money has been used in the past to pay for some -developers to travel to conferences like Git Merge. It may be used in +developers to travel to conferences like Git Merge, and may be used in the future to pay Outreachy student stipends. The governance of the Git project as part of the SFC is in the hands -of Junio Hamano, Shawn Pearce and Jeff King. The main activity of the +of Junio Hamano, Shawn Pearce, and Jeff King. The main activity of the governance consists in handling trademark issues related to the "Git" trademark that the project owns. -There are a number of projects who call themselves Git XXX and the +There are a number of projects who call themselves "Git XXX" and the trademark policy on git-scm.org is used to decide if those trademarks are approved or not. -Another activity is related to defending the license which is the -GPLv2. There have been some vendors who distributed Git with some -changes, but did not provide the source code of the Git version they -distributed. For now it has been possible to resolve these cases, but -it is not completely clear if some vendors currently fullfill all -their obligations. In case some developers who contributed to Git -wants to take a close look at what the vendors are doing, the SFC can -help them. +Another activity is related to defending the license, which is the +GPLv2. For example, there have previously been vendors distributing +Git with some changes, but without providing the source code for the Git version they +were distributing. So far it has been possible to resolve these cases, but +it is not completely clear if all vendors are currently fullfilling all of +their obligations. If any developers who have contributed to Git +want to take a closer look at what the vendors are doing, the SFC are +able to help them. After that SubmitGit was discussed as well as ways to make it easier -for people who are not yet Git developers to contribute. TravisCI +for people who are not yet Git developers to contribute. TravisCI, which can be used to automatically test pull requests that are -submitted on GitHub was also discussed at the same time. +submitted on GitHub, was also discussed at the same time. It appeared that it would be good to also be able to test pull -requests on Windows machines but TravisCI doesn't support Windows -yet. To help on this GitLab CEO, Sytse "Sid" Sijbrandij, offered to -let the project use GitLab CI which supports Linux, OSX and Windows. +requests on Windows machines, but TravisCI doesn't support Windows +yet. To help on this GitLab CEO Sytse "Sid" Sijbrandij offered to +let the project use GitLab CI, which supports Linux, OSX, and Windows. Various subjects were then discussed a bit, like case insensitive -refnames and filenames, submodules and Git on Celph which is a file +refnames and filenames, submodules, and Git on Celph, which is a file system for computer clusters. A mix of long time and quite new Git contributors, along with people -from Git related projects and companies attended. The atmosphere was +from Git related projects and companies, attended. The atmosphere was relaxed and informal. Overall it was a very pleasant event. * [20 Tricks with Git and Shell](https://speakerdeck.com/nibalizer/20-tricks-with-git-and-bash) From 58fb12b9fc9d2395dc6a14a12d3e7b384ba39af8 Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Mon, 9 May 2016 12:09:18 +1000 Subject: [PATCH 0038/2664] Fix typo in git alias example --- rev_news/drafts/edition-15.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index b745efced2..5809e231fd 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -91,7 +91,7 @@ Some of the tricks he showed are available in his The presentation started with simple shell aliases like `alias sl='ls'` to cope with typos and `alias g='git'` to reduce typing, then a bit more complex ones to avoid typing common arguments like `alias -gprom='git push origin master'` and `alias pydoc='python -m pydoc'`, +gpom='git push origin master'` and `alias pydoc='python -m pydoc'`, until validation aliases like: ``` From 4996619028cfe9bb6827096b917aa21a7dae07fc Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Mon, 9 May 2016 12:14:21 +1000 Subject: [PATCH 0039/2664] Expand explanation of example submodule grep alias --- rev_news/drafts/edition-15.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index 5809e231fd..714aefbe14 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -98,8 +98,9 @@ until validation aliases like: alias yamlcheck='python -c "import sys, yaml as y; y.safe_load(open(sys.argv[1]))"' ``` -Then Spencer spoke about customized prompts for git, filesystems and -tools, and about git config aliases, for example: +Spencer then spoke about customized prompts for git, filesystems and +tools, and about git config aliases. For example, this alias that makes +grepping through your submodules easy: ``` [alias] From f4ba4f814d738bb8cfc9d945e498bff5bfbe119e Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Mon, 9 May 2016 12:24:11 +1000 Subject: [PATCH 0040/2664] Use consistent formatting for shell scripts --- rev_news/drafts/edition-15.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index 714aefbe14..a5472a0c1f 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -113,13 +113,11 @@ After that came functions. Some were general like: ``` # Get to the top of a git tree cdp () { - TEMP_PWD=`pwd` while ! [ -d .git ]; do cd .. done OLDPWD=$TEMP_PWD - } ``` From 3ddf9e8cbf2d04ba0ceec84f93111cbfbc565389 Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Mon, 9 May 2016 12:35:46 +1000 Subject: [PATCH 0041/2664] Expand vim inspect history example --- rev_news/drafts/edition-15.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index a5472a0c1f..73d3854e8e 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -137,11 +137,11 @@ function pr() { ``` In the end Spencer showed how to combine multiple small features to -get something interesting. First vim can be started at a given line by -giving the line in a +[num] argument, for example `vim +24`, then one -can get the previous command typed on the command line using -`history | tail -n 2 | head -1`, and finally one can use `git grep -n XXX` -to get a grep result from Git with a line number. +get something interesting. Take the following 3 tricks: + +* Vim can be started at a given line by giving the line in a +[num] argument, for example `vim +24` +* The previous command typed on the command line can be obtained using `history | tail -n 2 | head -1` +* `git grep -n XXX` will show a grep result from Git with a line number These 3 small tricks can be used in the following big one: From 15afbceea66a97fcb89f72a5acfc85a2bd25ac40 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 9 May 2016 21:34:04 +0200 Subject: [PATCH 0042/2664] rn-15: add David Turner's interview --- rev_news/drafts/edition-15.md | 58 +++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index 2b7c985ea4..c975e772c0 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -167,6 +167,64 @@ Google Summer of Code 2016 under the Git project. He will work on incrementaly rewriting in C the parts of "git bisect" that are still in shell. He will be mentored by Lars Schneider and Christian Couder. +## Developer Spotlight: David Turner + +* Who are you, what do you do and why were you at the Git Merge? + +I am a free software developer (and occasional board game designer). I +currently work on developer tools at Twitter. My focus is on making +Git faster. I was at Git Merge and the Git Core Contributors Summit to +meet other Git developers. I really enjoyed meeting you and the other +contributors. + +* What would you name your most important contribution to Git? + +My most important contribution was probably ensuring that cache-trees +are written on checkout and commit (from 2014). I've done a bunch of +work since then on refs, the index-helper, and fixed a few really weird +bugs (http range requests might be the weirdest). But most of the +performance work I have done is still in-progress. The cache-tree fix +has been in git since I think 2.2, and it affects daily performance for +anyone using a medium to large repo. + +* What are you doing on the Git project these days, and why? + +I'm working on a few different things: +- Alternate ref backends (storing refs in a database) +- Reviewing protocol v2 patches (and, perhaps, adding new protocol +capabilities allowing single-branch fetches to be more efficient) +- The index-helper and watchman support for faster status on large +repositories + +* If you could get a team of expert developers to work full time on +something in Git for a full year, what would it be? + +I would rewrite all index access code to only look a the relevant +portions of the index. Right now, many Git commands scan the entire +index, which does not scale well. It would be much better if git +status and related commands ran in O(number of changes) instead of +O(size of repository). This would be a major effort, but the end +result would be a much faster Git. + +* If you could remove something from Git without worrying about +backwards compatibility, what would it be? + +I would completely redesign the UX. For instance, the famous +"git checkout $branch" vs "git checkout -b" vs "git checkout $filename" +confusion could be completely eliminated by using a different verb for +each of these things. + +My work focuses on performance because that is what I enjoy and am good +at. But I think UX work is often more important, and I wish that there +were a way to correct some historical UX decisions. + +* What is your favourite Git-related tool/library, outside of Git +itself? + +Michael Haggerty just showed me [git tbdiff](https://github.com/trast/tbdiff), +which is very useful when rebasing a large patch series. I also have to mention +[git shamend](http://www.daniellesucher.com/2014/05/08/git-shamend/). + From 1d2a69d9eeb4d6b5bd4c170b5b46e18f61ddecea Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 9 May 2016 21:42:46 +0200 Subject: [PATCH 0043/2664] rn-15: try better list indent --- rev_news/drafts/edition-15.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index c975e772c0..f2d9e68535 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -190,11 +190,11 @@ anyone using a medium to large repo. * What are you doing on the Git project these days, and why? I'm working on a few different things: -- Alternate ref backends (storing refs in a database) -- Reviewing protocol v2 patches (and, perhaps, adding new protocol -capabilities allowing single-branch fetches to be more efficient) -- The index-helper and watchman support for faster status on large -repositories + - Alternate ref backends (storing refs in a database) + - Reviewing protocol v2 patches (and, perhaps, adding new protocol + capabilities allowing single-branch fetches to be more efficient) + - The index-helper and watchman support for faster status on large + repositories * If you could get a team of expert developers to work full time on something in Git for a full year, what would it be? From 92e673dbaf2039c576ee01a854446bb0a5ebf7e5 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 9 May 2016 21:48:43 +0200 Subject: [PATCH 0044/2664] rn-15: try qgqin better list indent --- rev_news/drafts/edition-15.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index f2d9e68535..224e6bee85 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -190,11 +190,11 @@ anyone using a medium to large repo. * What are you doing on the Git project these days, and why? I'm working on a few different things: - - Alternate ref backends (storing refs in a database) - - Reviewing protocol v2 patches (and, perhaps, adding new protocol - capabilities allowing single-branch fetches to be more efficient) - - The index-helper and watchman support for faster status on large - repositories + - Alternate ref backends (storing refs in a database) + - Reviewing protocol v2 patches (and, perhaps, adding new protocol + capabilities allowing single-branch fetches to be more efficient) + - The index-helper and watchman support for faster status on large + repositories * If you could get a team of expert developers to work full time on something in Git for a full year, what would it be? From c3ec10612e2017bf847b4739fa9486aa73d4a78e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 9 May 2016 21:50:44 +0200 Subject: [PATCH 0045/2664] rn-15: try yet again better list indent --- rev_news/drafts/edition-15.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index 224e6bee85..7dcdd43aca 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -190,11 +190,13 @@ anyone using a medium to large repo. * What are you doing on the Git project these days, and why? I'm working on a few different things: + - Alternate ref backends (storing refs in a database) - Reviewing protocol v2 patches (and, perhaps, adding new protocol - capabilities allowing single-branch fetches to be more efficient) + capabilities allowing single-branch fetches to be more + efficient) - The index-helper and watchman support for faster status on large - repositories + repositories * If you could get a team of expert developers to work full time on something in Git for a full year, what would it be? From 116bac8f2bf319100e41ed42c57cf5e6b85de454 Mon Sep 17 00:00:00 2001 From: Andrew Ardill Date: Tue, 10 May 2016 09:42:49 +1000 Subject: [PATCH 0046/2664] Use Software Freedom Conservancy style guide As per peff's suggestion, use Conservancy's style guide when discussing them. The style guide is as follows: * Please do not add a "the" in front of "Software Freedom Conservancy" or "Conservancy" in any written context. We've admittedly used a "the" intermittently in the past, but we'd like to be consistent going forward. So, instead of "Project X is a member of the Conservancy," just say "Project X is a member of Conservancy." * Please use "Conservancy" as the abbreviation for "Software Freedom Conservancy." We're discontinuing the use of the acronym "SFC," and we ask your help in doing the same. --- rev_news/drafts/edition-15.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index 73d3854e8e..f6721e071b 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -28,10 +28,10 @@ Git Merge conference on April 5 2016. At the Git Contributor Summit on April 4th, just after the lunch break, the state of the participation of the Git project in the Google Summer of Code (GSoC) and Outreachy were briefly mentioned. Jeff King, -alias Peff, then talked about the state of the Git project as part of -the [Software Freedom Conservancy (SFC)](https://sfconservancy.org/). +alias Peff, then talked about the state of the Git project as a member of +[Software Freedom Conservancy](https://sfconservancy.org/). -Git is one of the SFC Member Projects. The SFC manages the legal and +Git is one of Conservancy's Member Projects. Conservancy manages the legal and administrative aspects of the Git project, and also manages Git's money, which amounts to around $20000. This money comes mostly from donations made on git-scm.org, GSoC mentor stipends, and book @@ -39,7 +39,7 @@ royalties. The money has been used in the past to pay for some developers to travel to conferences like Git Merge, and may be used in the future to pay Outreachy student stipends. -The governance of the Git project as part of the SFC is in the hands +The governance of the Git project as part of Conservancy is in the hands of Junio Hamano, Shawn Pearce, and Jeff King. The main activity of the governance consists in handling trademark issues related to the "Git" trademark that the project owns. @@ -54,7 +54,7 @@ Git with some changes, but without providing the source code for the Git version were distributing. So far it has been possible to resolve these cases, but it is not completely clear if all vendors are currently fullfilling all of their obligations. If any developers who have contributed to Git -want to take a closer look at what the vendors are doing, the SFC are +want to take a closer look at what the vendors are doing, Conservancy is able to help them. After that SubmitGit was discussed as well as ways to make it easier @@ -80,8 +80,8 @@ relaxed and informal. Overall it was a very pleasant event. At the [Git Merge conference](http://git-merge.com/) on April 5th 2016 at [New World Stages](http://newworldstages.com/) in New York City, USA, Spencer Krum, who works for IBM in Portland and appears to be a -big fan of the -[SFC (Software Freedom Conservancy)](https://sfconservancy.org/), gave +big fan of +[Software Freedom Conservancy](https://sfconservancy.org/), gave an interesting and fast-paced presentation about some shell and Git command line tricks. From 9c3119e5671a1e9157187a762eb3c4a55b62eca6 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Wed, 11 May 2016 14:41:16 +0200 Subject: [PATCH 0047/2664] Rev News: mention the big BitKeeper news BitKeeper is now Open Source... --- rev_news/drafts/edition-15.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index 7dcdd43aca..bf3172e407 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -248,6 +248,7 @@ which is very useful when rebasing a large patch series. I also have to mention __Various__ +* BitKeeper, the inspiration for Git and Mercurial, [was released as Open Source](https://users.bitkeeper.org/t/bk-7-2ce-released-2016-05-09/93) (see also the discussion on [Hacker News](https://news.ycombinator.com/item?id=11667494) as well as [Linux Weekly News](https://lwn.net/Articles/686896/)). * [Fun with a new feature in recent Git](https://git-blame.blogspot.de/2016/05/fun-with-new-feature-in-recent-git.html) by Junio C Hamano * [4200 miles, 5GBs, 1 min: cloning with mirrors and Git LFS](http://blogs.atlassian.com/2016/04/bitbucket-data-center-smart-mirroring-with-git-lfs-support/) from Atlassian's Kelvin Yap * [GitHub: Import repositories with large files](https://github.com/blog/2163-import-repositories-with-large-files), by Jonathan Hoyt From e17fa580aecb977fe60e94248b72fcf167fe0619 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 11 May 2016 16:57:31 +0200 Subject: [PATCH 0048/2664] rn-15: add David, Andrew and Johannes as helpers --- rev_news/drafts/edition-15.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index ac765cb09f..c6796a749c 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -279,4 +279,4 @@ __Git tools and sites__ This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from XXX. +with help from David Turner, Andrew Ardill and Johannes Schindelin. From 69f26f98e7d294cde365ad446ea63b5d638b32ab Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 11 May 2016 16:58:33 +0200 Subject: [PATCH 0049/2664] rn-15: fix metadata --- rev_news/drafts/edition-15.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-15.md b/rev_news/drafts/edition-15.md index c6796a749c..8c6469125d 100644 --- a/rev_news/drafts/edition-15.md +++ b/rev_news/drafts/edition-15.md @@ -1,7 +1,7 @@ --- title: Git Rev News Edition 15 (May 11th, 2016) layout: default -date: 2016-05-11 21:06:51 +0100 +date: 2016-05-11 14:06:51 +0100 author: chriscool categories: [news] navbar: false From dc4941e74e8b93bd7aa4a3e11438492208bbe49f Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 11 May 2016 16:59:51 +0200 Subject: [PATCH 0050/2664] Publish Git Rev News edition 15 in _posts/ --- .../drafts/edition-15.md => _posts/2016-05-11-edition-15.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-15.md => _posts/2016-05-11-edition-15.markdown (100%) diff --git a/rev_news/drafts/edition-15.md b/_posts/2016-05-11-edition-15.markdown similarity index 100% rename from rev_news/drafts/edition-15.md rename to _posts/2016-05-11-edition-15.markdown From c6a20030643a27db180e5239fa2d40d0040674ae Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 11 May 2016 17:03:25 +0200 Subject: [PATCH 0051/2664] Add draft for rn-16 --- rev_news/drafts/edition-16.md | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 rev_news/drafts/edition-16.md diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md new file mode 100644 index 0000000000..d930d81e29 --- /dev/null +++ b/rev_news/drafts/edition-16.md @@ -0,0 +1,50 @@ +--- +title: Git Rev News Edition 16 (XXX, 2016) +layout: default +date: 2016-06-13 21:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 16 (XXX, 2016) + +Welcome to the 16th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). + +This edition covers what happened during the month of May 2016. + +## Discussions + + + + + + + +## Releases + + +## Other News + +__Various__ + + +__Light reading__ + + +__Git tools and sites__ + + +## Credits + +This edition of Git Rev News was curated by Christian Couder <>, +Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, +with help from XXX. From cd56b202818c16686079a49a271033b10c0572d1 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Thu, 12 May 2016 17:16:53 +0200 Subject: [PATCH 0052/2664] rev-news: git-multimail 1.3.0 --- rev_news/drafts/edition-16.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index d930d81e29..145e8984b8 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -31,6 +31,9 @@ This edition covers what happened during the month of May 2016. ## Releases +* git-multimail [1.3.0 was released](https://github.com/git-multimail/git-multimail/releases/tag/1.3.0) + with a focus on options to customize emails, more documentation and + a few SMTP-related improvements. ## Other News From 8d81ade1249a8171dfc51fc4c77c514fc3b2a006 Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Fri, 13 May 2016 23:22:43 +0200 Subject: [PATCH 0053/2664] git-multimail 1.3.1 --- rev_news/drafts/edition-16.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 145e8984b8..cd97ff155a 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -31,7 +31,8 @@ This edition covers what happened during the month of May 2016. ## Releases -* git-multimail [1.3.0 was released](https://github.com/git-multimail/git-multimail/releases/tag/1.3.0) +* git-multimail [1.3.0](https://github.com/git-multimail/git-multimail/releases/tag/1.3.0) and + [1.3.1](https://github.com/git-multimail/git-multimail/releases/tag/1.3.1) were released, with a focus on options to customize emails, more documentation and a few SMTP-related improvements. From d1006a57529513e7bbbe4f8234b4dcb01b9460ce Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 17 May 2016 05:10:22 +0200 Subject: [PATCH 0054/2664] rn-15: fix old style links --- _posts/2016-05-11-edition-15.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/2016-05-11-edition-15.markdown b/_posts/2016-05-11-edition-15.markdown index 8c6469125d..38fa3e7a60 100644 --- a/_posts/2016-05-11-edition-15.markdown +++ b/_posts/2016-05-11-edition-15.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 15 (May 11th, 2016) -Welcome to the 15th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +Welcome to the 15th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). This edition covers what happened during the month of April 2016, especially at the Git Contributor Summit on April 4 2016 and at the From b1570bd988bc87228eed7b4b38b0a7290c821b14 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 17 May 2016 05:14:13 +0200 Subject: [PATCH 0055/2664] rn-16: fix old style links --- rev_news/drafts/edition-16.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index cd97ff155a..98e36d986d 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 16 (XXX, 2016) -Welcome to the 16th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +Welcome to the 16th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). This edition covers what happened during the month of May 2016. From 9e4472f27e56cedaffe39d101abc3dc9ca611219 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 9 Jun 2016 13:52:59 -0400 Subject: [PATCH 0056/2664] convert all internal links to https Now that GitHub Pages can use https (and we'll be upgrading http requests to https), we can use https links everywhere to avoid the upgrade step. This is a purely mechanical conversion. I do wonder if some of these could be relative links (they are all referring to the git.github.io site itself), but here I've taken the most conservative route. --- SoC-2014-Ideas.md | 2 +- SoC-2014-Org-Application.md | 2 +- SoC-2015-Ideas.md | 2 +- SoC-2015-Org-Application.md | 2 +- SoC-2016-Ideas.md | 6 +++--- SoC-2016-Org-Application.md | 4 ++-- _posts/2015-03-25-edition-1.markdown | 6 +++--- _posts/2015-04-15-edition-2.markdown | 2 +- _posts/2015-05-13-edition-3.markdown | 4 ++-- _posts/2015-06-03-edition-4.markdown | 4 ++-- _posts/2015-07-08-edition-5.markdown | 4 ++-- _posts/2015-08-05-edition-6.markdown | 6 +++--- _posts/2015-09-09-edition-7.markdown | 6 +++--- _posts/2015-10-14-edition-8.markdown | 6 +++--- _posts/2015-11-11-edition-9.markdown | 4 ++-- _posts/2015-12-09-edition-10.markdown | 4 ++-- _posts/2016-01-13-edition-11.markdown | 4 ++-- _posts/2016-02-10-edition-12.markdown | 6 +++--- _posts/2016-03-16-edition-13.markdown | 4 ++-- _posts/2016-04-20-edition-14.markdown | 8 ++++---- _posts/2016-05-11-edition-15.markdown | 6 +++--- feed.xml | 10 +++++----- rev_news/drafts/edition-16.md | 4 ++-- rev_news/edition-1.md | 6 +++--- 24 files changed, 56 insertions(+), 56 deletions(-) diff --git a/SoC-2014-Ideas.md b/SoC-2014-Ideas.md index a873d89874..a1dababfc7 100644 --- a/SoC-2014-Ideas.md +++ b/SoC-2014-Ideas.md @@ -11,7 +11,7 @@ This is the idea page for Summer of Code 2014 for Git and libgit2. It is strongly recommended that students who want to apply to the Git project for the Summer of Code 2014 complete a tiny, code-related "microproject" as part of their application. Please refer to our -[guidelines and suggestions for microprojects](http://git.github.io/SoC-2014-Microprojects.html) +[guidelines and suggestions for microprojects](https://git.github.io/SoC-2014-Microprojects.html) for more information. Completing a microproject is not a strict requirement, but we will definitely give more attention to applicants who do so. Doing a microproject will also help get you started in diff --git a/SoC-2014-Org-Application.md b/SoC-2014-Org-Application.md index 85e5a6bee7..a3ea432de6 100644 --- a/SoC-2014-Org-Application.md +++ b/SoC-2014-Org-Application.md @@ -35,7 +35,7 @@ GPLv2 ## Ideas list - + ## Mailing list diff --git a/SoC-2015-Ideas.md b/SoC-2015-Ideas.md index ba8b25e2f1..856c4bd1b5 100644 --- a/SoC-2015-Ideas.md +++ b/SoC-2015-Ideas.md @@ -10,7 +10,7 @@ This is the idea page for Summer of Code 2015 for Git and libgit2. It is required that students who want to apply to the Git project for the Summer of Code 2015 complete a tiny, code-related "microproject" as part of their application. Please refer to our -[guidelines and suggestions for microprojects](http://git.github.io/SoC-2015-Microprojects.html) +[guidelines and suggestions for microprojects](https://git.github.io/SoC-2015-Microprojects.html) for more information. Completing a microproject is not only an important way for us to get experience with applicants, but it will also help applicants become familiar with Git's development and submission diff --git a/SoC-2015-Org-Application.md b/SoC-2015-Org-Application.md index 5b476c549c..8734f6b036 100644 --- a/SoC-2015-Org-Application.md +++ b/SoC-2015-Org-Application.md @@ -34,7 +34,7 @@ GPLv2 ## Ideas list - + ## Mailing list diff --git a/SoC-2016-Ideas.md b/SoC-2016-Ideas.md index 7d849dc947..1d54b2cc9f 100644 --- a/SoC-2016-Ideas.md +++ b/SoC-2016-Ideas.md @@ -13,7 +13,7 @@ This is the idea page for Summer of Code 2016 for Git and libgit2. It is required that students who want to apply to the Git project for the Summer of Code 2016 complete a tiny, code-related "microproject" as part of their application. Please refer to our -[guidelines and suggestions for microprojects](http://git.github.io/SoC-2016-Microprojects) +[guidelines and suggestions for microprojects](https://git.github.io/SoC-2016-Microprojects) for more information. Completing a microproject is not only an important way for us to get experience with applicants, but it will also help applicants become familiar with Git's development and submission @@ -54,7 +54,7 @@ discussion. Getting your proposal right can follow the same process as usual patch submission for Git, as described in the -[microprojects](http://git.github.io/SoC-2016-Microprojects) page and +[microprojects](https://git.github.io/SoC-2016-Microprojects) page and in `Documentation/SubmittingPatches` in Git's source code. It is also expected that you will send several versions of your draft, responding to comments on the list. If you are not sure about your proposal, you @@ -63,7 +63,7 @@ separate emails. Please use "[GSoC]" at the beginning of such emails. In summary, all applicants must (not necessarily in this order): -* Complete a [microproject](http://git.github.io/SoC-2016-Microprojects). +* Complete a [microproject](https://git.github.io/SoC-2016-Microprojects). * Write a detailed application explaining their project. diff --git a/SoC-2016-Org-Application.md b/SoC-2016-Org-Application.md index b1f4c9ceba..5c2ba5c736 100644 --- a/SoC-2016-Org-Application.md +++ b/SoC-2016-Org-Application.md @@ -37,7 +37,7 @@ version control, dvcs ## Ideas List - + ## Short Description (180 chars max) @@ -69,7 +69,7 @@ template or tips for their proposals. May include limited Markdown. ``` Please read the "About applying for SoC with the Git project" section -in the ideas page: http://git.github.io/SoC-2016-Ideas/ +in the ideas page: https://git.github.io/SoC-2016-Ideas/ The primary way to contact the Git community is through the Git mailing list git@vger.kernel.org. Please discuss your application on diff --git a/_posts/2015-03-25-edition-1.markdown b/_posts/2015-03-25-edition-1.markdown index 8630aa3a4e..33f0f26c7b 100644 --- a/_posts/2015-03-25-edition-1.markdown +++ b/_posts/2015-03-25-edition-1.markdown @@ -8,7 +8,7 @@ categories: [news] ## 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/), +Welcome to the first edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git, written collaboratively on [GitHub](https://github.com/git/git.github.io) by volunteers. @@ -55,7 +55,7 @@ Git this year, anticipated the start of the GSoC and sent a patch to rewrite git-pull.sh as a built-in. Indeed as stated in [the GSoC idea -page](http://git.github.io/SoC-2015-Ideas.html): +page](https://git.github.io/SoC-2015-Ideas.html): > Many components of Git are still in the form of shell and Perl @@ -117,7 +117,7 @@ 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 +[microproject](https://git.github.io/SoC-2015-Microprojects.html) to make sure that they can work properly with the community. Eric Sunshine made some good general suggestions that are often made diff --git a/_posts/2015-04-15-edition-2.markdown b/_posts/2015-04-15-edition-2.markdown index a9d93b9772..e1752179a4 100644 --- a/_posts/2015-04-15-edition-2.markdown +++ b/_posts/2015-04-15-edition-2.markdown @@ -8,7 +8,7 @@ navbar: false --- ## Git Rev News: Edition 2 (April 15, 2015), 10 years of Git & Git Merge 2015! -Welcome to the second edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the second edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git, written collaboratively on [GitHub](https://github.com/git/git.github.io) by volunteers. diff --git a/_posts/2015-05-13-edition-3.markdown b/_posts/2015-05-13-edition-3.markdown index 081454b575..4590a8bd17 100644 --- a/_posts/2015-05-13-edition-3.markdown +++ b/_posts/2015-05-13-edition-3.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 3 (May 13, 2015) -Welcome to the third edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the third edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, how to contribute or to -subscribe see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on http://git.github.io. +subscribe see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on https://git.github.io. This edition still covers Git's 10th year of existence, as well as the [Git Merge](http://git-merge.com) conference held on April 8th & 9th in Paris, diff --git a/_posts/2015-06-03-edition-4.markdown b/_posts/2015-06-03-edition-4.markdown index 935105bc9f..4919776aa8 100644 --- a/_posts/2015-06-03-edition-4.markdown +++ b/_posts/2015-06-03-edition-4.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 4 (June 3rd, 2015) -Welcome to the fourth edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the fourth edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of May 2015. diff --git a/_posts/2015-07-08-edition-5.markdown b/_posts/2015-07-08-edition-5.markdown index 2c098ff4f9..709304d014 100644 --- a/_posts/2015-07-08-edition-5.markdown +++ b/_posts/2015-07-08-edition-5.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 5 (July 8th, 2015) -Welcome to the fifth edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the fifth edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of June 2015. diff --git a/_posts/2015-08-05-edition-6.markdown b/_posts/2015-08-05-edition-6.markdown index 7226687844..a4847baf84 100644 --- a/_posts/2015-08-05-edition-6.markdown +++ b/_posts/2015-08-05-edition-6.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 6 (August 5th, 2015) -Welcome to the sixth edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the sixth edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of July 2015. @@ -253,7 +253,7 @@ community that we set out to be, we need your help. So please, the next time you read through an interesting discussion on the mailing list, note down a few lines about it and -[share them with us](http://git.github.io/rev_news/rev_news/). +[share them with us](https://git.github.io/rev_news/rev_news/). ---- diff --git a/_posts/2015-09-09-edition-7.markdown b/_posts/2015-09-09-edition-7.markdown index 5b2bf9c385..bf44dcd61a 100644 --- a/_posts/2015-09-09-edition-7.markdown +++ b/_posts/2015-09-09-edition-7.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 7 (September 9th, 2015) -Welcome to the 7th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the 7th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of August 2015. @@ -123,7 +123,7 @@ effect if it breaks is. Reading the students proposals and resume is rarely sufficient to really evaluate their skills, which makes the risk particularly hard to evaluate. Since 2014, we've been using -[microprojects](http://git.github.io/SoC-2015-Microprojects.html) to +[microprojects](https://git.github.io/SoC-2015-Microprojects.html) to select students. This turned out to be very efficient, both at identifying good (or bad) applicants, but also at giving students a glimpse of what "contributing to Git" means. Student get an idea of diff --git a/_posts/2015-10-14-edition-8.markdown b/_posts/2015-10-14-edition-8.markdown index 89db155396..6ae33b5a42 100644 --- a/_posts/2015-10-14-edition-8.markdown +++ b/_posts/2015-10-14-edition-8.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 8 (October 14th, 2015) -Welcome to the 8th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the 8th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of September 2015. @@ -239,7 +239,7 @@ I only found this recently, it's just brilliant. Thank you, whoever it was put t __Updates__ -* [Since we talked about it last month](http://git.github.io/rev_news/2015/09/09/edition-7/) David Turner +* [Since we talked about it last month](https://git.github.io/rev_news/2015/09/09/edition-7/) David Turner submitted [a new patch series](http://thread.gmane.org/gmane.comp.version-control.git/278757) of his work on alternate ref backends. This work is being reviewed by Michael Haggerty, Junio, and others. The ultimate goal is still to allow a lmdb-based backend, which should be faster and have fewer issues on diff --git a/_posts/2015-11-11-edition-9.markdown b/_posts/2015-11-11-edition-9.markdown index 9190bd3dc6..ba58a7fe16 100644 --- a/_posts/2015-11-11-edition-9.markdown +++ b/_posts/2015-11-11-edition-9.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 9 (November 11th, 2015) -Welcome to the 9th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the 9th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of October 2015. diff --git a/_posts/2015-12-09-edition-10.markdown b/_posts/2015-12-09-edition-10.markdown index 14213a0c4b..b67eeb34e8 100644 --- a/_posts/2015-12-09-edition-10.markdown +++ b/_posts/2015-12-09-edition-10.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 10 (December 9th, 2015) -Welcome to the 10th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the 10th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of November 2015. diff --git a/_posts/2016-01-13-edition-11.markdown b/_posts/2016-01-13-edition-11.markdown index e918b21734..076664190b 100644 --- a/_posts/2016-01-13-edition-11.markdown +++ b/_posts/2016-01-13-edition-11.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 11 (January 13th, 2016) -Welcome to the 11th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the 11th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of December 2015. diff --git a/_posts/2016-02-10-edition-12.markdown b/_posts/2016-02-10-edition-12.markdown index 8c2e718792..4b21882de8 100644 --- a/_posts/2016-02-10-edition-12.markdown +++ b/_posts/2016-02-10-edition-12.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 12 (February 10th, 2016) -Welcome to the 12th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the 12th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of January 2016. @@ -35,7 +35,7 @@ work to add a database backend to store Git refs: This work was started a long time ago by Ronnie Sahlberg, working for Google, and has already been reported about in -[Git Rev News edition 7](http://git.github.io/rev_news/2015/09/09/edition-7/). +[Git Rev News edition 7](https://git.github.io/rev_news/2015/09/09/edition-7/). These last patch series have again been reviewed or commented on by a lot of experienced Git developers, like Junio Hamano, Michael diff --git a/_posts/2016-03-16-edition-13.markdown b/_posts/2016-03-16-edition-13.markdown index c510b1fa58..637f7d691e 100644 --- a/_posts/2016-03-16-edition-13.markdown +++ b/_posts/2016-03-16-edition-13.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 13 (March 16th, 2016) -Welcome to the 13th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the 13th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of February 2016. diff --git a/_posts/2016-04-20-edition-14.markdown b/_posts/2016-04-20-edition-14.markdown index 32a28ecd65..7474d7ec67 100644 --- a/_posts/2016-04-20-edition-14.markdown +++ b/_posts/2016-04-20-edition-14.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 14 (April 20th, 2016) -Welcome to the 14th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the 14th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of March 2016 and also what happened at the Git Contributor Summit on April 4 2016 and @@ -53,8 +53,8 @@ going on to implement additional ref backends, especially a [lmdb](http://symas.com/mdb/) based one. (This work on an lmdb based ref backend has been reported on in -[Git Rev News edition 12](http://git.github.io/rev_news/2016/02/10/edition-12/) and -[Git Rev News edition 7](http://git.github.io/rev_news/2015/09/09/edition-7/).) +[Git Rev News edition 12](https://git.github.io/rev_news/2016/02/10/edition-12/) and +[Git Rev News edition 7](https://git.github.io/rev_news/2015/09/09/edition-7/).) From there the discussion switched to the case sensitiveness of ref names, and the different problems created by having ref names that diff --git a/_posts/2016-05-11-edition-15.markdown b/_posts/2016-05-11-edition-15.markdown index 38fa3e7a60..c721484570 100644 --- a/_posts/2016-05-11-edition-15.markdown +++ b/_posts/2016-05-11-edition-15.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 15 (May 11th, 2016) -Welcome to the 15th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the 15th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of April 2016, especially at the Git Contributor Summit on April 4 2016 and at the @@ -23,7 +23,7 @@ Git Merge conference on April 5 2016. * Discussions at the Git Contributor Summit, part 2, about misc topics -*Read part 1 in [Git Rev News Edition 14](http://git.github.io/rev_news/2016/04/20/edition-14/)* +*Read part 1 in [Git Rev News Edition 14](https://git.github.io/rev_news/2016/04/20/edition-14/)* At the Git Contributor Summit on April 4th, just after the lunch break, the state of the participation of the Git project in the Google diff --git a/feed.xml b/feed.xml index cf8e1914b9..5511fe0cd4 100644 --- a/feed.xml +++ b/feed.xml @@ -14,8 +14,8 @@ navbar: false > Git Rev News - - http://git.github.io/rev_news/ + + https://git.github.io/rev_news/ {{ site.time | date_to_rfc822 }} {{ site.time | date_to_rfc822 }} en-US @@ -25,14 +25,14 @@ navbar: false Git Rev News http://jekyllrb.com/img/logo-rss.png Git Rev News - http://git.github.io/rev_news/ + https://git.github.io/rev_news/ 144 73 {% for post in site.posts %} {{ post.title | xml_escape}} - http://git.github.io{{ post.url }} + https://git.github.io{{ post.url }} {{ post.date | date_to_rfc822 }} {{ post.author }} {% for tag in post.tags %} @@ -41,7 +41,7 @@ navbar: false {% for cat in post.categories %} {{ cat | xml_escape }} {% endfor %} - http://git.github.io{{ post.url }} + https://git.github.io{{ post.url }} {{ post.content | xml_escape }} {% endfor %} diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 98e36d986d..c5efa0a81f 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 16 (XXX, 2016) -Welcome to the 16th edition of [Git Rev News](http://git.github.io/rev_news/rev_news/), +Welcome to the 16th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](https://git.github.io). This edition covers what happened during the month of May 2016. diff --git a/rev_news/edition-1.md b/rev_news/edition-1.md index b81326b2a3..c1c9ff28f2 100644 --- a/rev_news/edition-1.md +++ b/rev_news/edition-1.md @@ -7,7 +7,7 @@ navbar: false ## 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/), +Welcome to the first edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git, written collaboratively on [GitHub](https://github.com/git/git.github.io) by volunteers. @@ -54,7 +54,7 @@ Git this year, anticipated the start of the GSoC and sent a patch to rewrite git-pull.sh as a built-in. Indeed as stated in [the GSoC idea -page](http://git.github.io/SoC-2015-Ideas.html): +page](https://git.github.io/SoC-2015-Ideas.html): ``` Many components of Git are still in the form of shell and Perl @@ -122,7 +122,7 @@ 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 +[microproject](https://git.github.io/SoC-2015-Microprojects.html) to make sure that they can work properly with the community. Eric Sunshine made some good general suggestions that are often made From 6620aa53a2d2cd27f71f9e444a903ff94277ece6 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 11 Jun 2016 00:09:11 +0200 Subject: [PATCH 0057/2664] rn-16: set publication date to June 15th --- rev_news/drafts/edition-16.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index c5efa0a81f..b7b65de40d 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -1,13 +1,13 @@ --- -title: Git Rev News Edition 16 (XXX, 2016) +title: Git Rev News Edition 16 (June 15th, 2016) layout: default -date: 2016-06-13 21:06:51 +0100 +date: 2016-06-15 21:06:51 +0100 author: chriscool categories: [news] navbar: false --- -## Git Rev News: Edition 16 (XXX, 2016) +## Git Rev News: Edition 16 (June 15th, 2016) Welcome to the 16th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to From 594f684a8b9e7b3b6fb4e565c9004a09c5b8bd55 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 11 Jun 2016 17:31:05 +0200 Subject: [PATCH 0058/2664] rn-16: add article about new filters --- rev_news/drafts/edition-16.md | 47 +++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index b7b65de40d..397aecf8ab 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -17,9 +17,52 @@ This edition covers what happened during the month of May 2016. ## Discussions - + +* [proposal for extending smudge/clean filters with raw file access](http://thread.gmane.org/gmane.comp.version-control.git/294425) + +Joey Hess, who is the [git-annex](https://git-annex.branchable.com/) +main developer and maintainer, sent an email with some suggestions to +extend smudge/clean filters. + +So called Smudge/clean filters can be used to automatically perform +transformations on the content when it is checked into Git or out of +it. This can be used for example to perform keyword substitution like +Subversion or CVS allows with keywords named '$Id$', '$Rev$' or +'$Author$'. + +The idea is that these filters would call git-annex automatically and +git-annex could decide, when a file is added, if its content should +indeed by handled regularly by the Git repo or if it should be handled +by git-annex. In a similar way when a file is checked out, git-annex +would be called and could get the file content it by itself if it is +managing the file. + +Joey's suggestions on the mailing list were the following: + +``` +I'm using smudge/clean filters in git-annex now, and it's not been an +entirely smooth fit between the interface and what git-annex wants +to do. + +... + +So I propose extending the filter driver with two more optional +commands. Call them raw-clean and raw-smudge for now. + +raw-clean would be like clean, but rather than being fed the whole +content of a large file on stdin, it would be passed the filename, and +can access the file itself. Like the clean filter, it outputs the +cleaned version on stdout. + +raw-smudge would be like smudge, but rather than needing to output the +whole content of a large file on stdout, it would be passed a filename, +and can create that file itself. +``` + +After discussing those new commands with Junio Hamano, the Git +maintainer, it looks like patches to add them could be accepted. The +names "clean-from-fs" and "smudge-to-fs" have been suggested for them. - + +* [http://thread.gmane.org/gmane.comp.version-control.git/295135](Odd Difference Between Windows Git and Standard Git) + +Jon Forrest sent an email about a `git status` behavior he sees on +Windows, which is different than on Linux on a repository that is +shared between the two environments. On Windows it looks like "every +.pdf file and some .png files are modified". + +Torsten Bögershausen, who has been working on Windows compatibility +lately, especially related to line ending, first asked Jon some basic +questions: + +``` +What does +git diff +say ? + +What does +git config -l | grep core +say ? + +And what does +git ls-files --eol +say? +``` + +As Jon answered: + +``` +old mode 100755 +new mode 100644 +``` + +Torsten replied: + +``` +So the solution is to run +git config core.filemode false +``` + +Jon replied: + +``` +This worked perfectly! + +I wonder if this should be the default for Git for Windows. +``` + +To which Torsten replied: + +``` +It is. +But you need to clone the repo under Windows. + +I probably submit a patch some day, that core.filemode will be ignored +under Windows. +``` + +From further discussions, it appeared that, when cloning a repo or +when using `git init`, we probe to see if the executable bit "sticks" +to the files and we set the 'core.filemode' config variable +accordingly. That works well, but we don't probe at other times, so it +doesn't work well for repos that are shared using a network filesystem +or Dropbox. + +To try to fix that, Torsten suggested a patch so that the +'core.filemode' setting is ignored under Windows. The problem with +that, is that dictating "for all eternity that Git for Windows cannot +determine the executable bit" might not be a good long term strategy, +as "who knows for certain?". + +Johannes Schindelin, the Git for Windows maintainer, suggested making +the default 'core.filemode' setting platform-dependent. This last +solution is already used for end of line setting. But it doesn't fix +the problem when a repo created on Linux, where 'core.filemode' has +been automatically set to true at init time, is shared. + +Another solution would be to probe more often than just when cloning +or using `git init`, but it appears that we don't want to do that for +each command and it is not clear how to easily probe when there might +not even be a '.git' directory. + +The conclusion from the thread is that unfortunately it looks like +there is no simple solution to avoid this kind of problems for now. ## Releases From c6051b20fd7111c87f5e93d29685a501e1930778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erwan=20Mathoni=C3=A8re?= Date: Sun, 12 Jun 2016 21:10:27 +0200 Subject: [PATCH 0062/2664] Ensimag contributing to git Like in 2015 (https://git.github.io/rev_news/2015/07/08/edition-5/), students from engineering school Ensimag contributed to Git. This is a small article to thank the community and to show what we did during these 4 weeks. --- rev_news/drafts/edition-16.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 5fe2ac23d8..b7ad6e286e 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -19,6 +19,22 @@ This edition covers what happened during the month of May 2016. ### General +* Ensimag students contributing to Git + +Attracted by the Open Source world, we, eight French students from [Grenoble INP - Ensimag](http://ensimag.grenoble-inp.fr), are having their first experience in contributing to an Open Source software by joining the Git community for a 4-week school project. It was a great opportunity to participate in a useful non-academic project and to practice what we’ve learned at school. + +To get to know the Git community, we started with simple improvements: using `-` as a shortcut for `@{-1}` for `git worktree add`, adding CSS pattern for `git diff ` and using the parser API for `git upload-pack`. Part of the job was also to start discussions on different subjects: how to setup a Triangular Workflow, about the consistency of the documentation and its readability concerning literals... + +One of our main work was to implement a feature that allows to easily reply to a given email with the `git send-email` command: it populates appropriate header (`To:` / `Cc:` / …) and cites the given message body. Another one was to add the symmetrical of `git push --set-upstream` to `git pull`. We also worked on a deny policy to prevent accidental pushes to unwanted remote using a blacklist/whitelist list feature. Some of us improved the strbuf API by using stack-allocated memory instead of heap-allocated to avoid malloc and free. + +It was a great experience to face real practical issues when it comes to developing a software with thousands other developers all around the world. We’ve learned a lot about rigor and communication which really were at the center of our work. Maybe we’ll see each other again on the mailing list since some of us are willing to finish the patch they were working on and possibly continue the adventure. + +We also all wanted to thank Git folks for the time they spent reviewing our patches and helping us. + +But for sure, launching a git command will never feel the same ;-) + +*(written by François BEUTIN, Jordan DE GEA, William DUCLOT, Samuel GROOT, Erwan MATHONIERE, Antoine QUERU, Simon RABOURG and Tom RUSSELLO)* + * [proposal for extending smudge/clean filters with raw file access](http://thread.gmane.org/gmane.comp.version-control.git/294425) Joey Hess, who is the [git-annex](https://git-annex.branchable.com/) From dbb61231b4054880a838261baa1e8e7e23e3ee03 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 12 Jun 2016 21:58:25 +0200 Subject: [PATCH 0063/2664] rn-16: add Duy's interview --- rev_news/drafts/edition-16.md | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 5fe2ac23d8..2ad372149e 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -154,6 +154,58 @@ not even be a '.git' directory. The conclusion from the thread is that unfortunately it looks like there is no simple solution to avoid this kind of problems for now. +## Developer Spotlight: Duy Nguyen + +* Who are you, and what do you do? + +I became a Linux user since 2001 or so when I bought myself a Red Hat +CD to celebrate joining the university. I was a GNOME Vietnamese +translator for about ten years before giving up for lack of free time, +and a Gentoo developer for four or five years (giving up for the same +reason). By day I'm a software developer working mostly in telecom +area. + +* What would you name your most important contribution to Git? + +It's been 10 years and I don't have very good memory. But I guess I +would name it sparse checkout. It's far from perfect, but I'm working +on that. + +* What are you doing on the Git project these days, and why? + +I'm still scratching my own itches and trying to push changes back in +git.git so I don't have to maintain them separately. They are "git +worktree move", dealing with the shared $GIT_DIR/config file in +multiple worktrees, diff rename annotation, a builtin version of +diff-highlight script, to name a few. There are some more challenging +work like narrow clone or pack version 4, which is just fun to do. +Though "fun" sometimes translates to "headache". + +* If you could get a team of expert developers to work full time on + something in Git for a full year, what would it be? + +I don't know :-) I don't see far ahead in the future of Git because +I'm mostly busy dealing with my own unhappiness with some aspect of +Git. But if I could, maybe rewrite Git from scratch? On a smaller +scale, we still have problems with "big numbers" in Git, may it be the +number of refs, of files in a working tree, of objects to transfer or +the size of an object... We know how to deal with some of these +already and a dedicated expert team could help make it happen much +faster. + +* If you could remove something from Git without worrying about + backwards compatibility, what would it be? + +Hmm.. there are lots of things I want to replace if backward +compatibility is thrown out of the window, but removing...no, probably +none. + +* What is your favourite Git-related tool/library, outside of Git itself? + +None. If it's good and related to Git, I try to integrate it in Git +itself so I don't have extra dependencies :) + + ## Releases * git-multimail [1.3.0](https://github.com/git-multimail/git-multimail/releases/tag/1.3.0) and From 8b16df2941b5a103b73817a77586c5d575fd7f3c Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 12 Jun 2016 21:59:53 +0200 Subject: [PATCH 0064/2664] rn-16: add Duy among the helpers --- rev_news/drafts/edition-16.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 2ad372149e..b86c08ca95 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -228,4 +228,4 @@ __Git tools and sites__ This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from Matthieu Moy. +with help from Duy Nguyen and Matthieu Moy. From 4ed6d01ca593c6eb59b57a3d609cef451164163e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 12 Jun 2016 22:27:41 +0200 Subject: [PATCH 0065/2664] rn-16: reformat students' article --- rev_news/drafts/edition-16.md | 45 +++++++++++++++++++++++++++-------- 1 file changed, 35 insertions(+), 10 deletions(-) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 87945a134d..02695b3197 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -21,15 +21,38 @@ This edition covers what happened during the month of May 2016. * Ensimag students contributing to Git -Attracted by the Open Source world, we, eight French students from [Grenoble INP - Ensimag](http://ensimag.grenoble-inp.fr), are having their first experience in contributing to an Open Source software by joining the Git community for a 4-week school project. It was a great opportunity to participate in a useful non-academic project and to practice what we’ve learned at school. - -To get to know the Git community, we started with simple improvements: using `-` as a shortcut for `@{-1}` for `git worktree add`, adding CSS pattern for `git diff ` and using the parser API for `git upload-pack`. Part of the job was also to start discussions on different subjects: how to setup a Triangular Workflow, about the consistency of the documentation and its readability concerning literals... - -One of our main work was to implement a feature that allows to easily reply to a given email with the `git send-email` command: it populates appropriate header (`To:` / `Cc:` / …) and cites the given message body. Another one was to add the symmetrical of `git push --set-upstream` to `git pull`. We also worked on a deny policy to prevent accidental pushes to unwanted remote using a blacklist/whitelist list feature. Some of us improved the strbuf API by using stack-allocated memory instead of heap-allocated to avoid malloc and free. - -It was a great experience to face real practical issues when it comes to developing a software with thousands other developers all around the world. We’ve learned a lot about rigor and communication which really were at the center of our work. Maybe we’ll see each other again on the mailing list since some of us are willing to finish the patch they were working on and possibly continue the adventure. - -We also all wanted to thank Git folks for the time they spent reviewing our patches and helping us. +Attracted by the Open Source world, we, eight French students from +[Grenoble INP - Ensimag](http://ensimag.grenoble-inp.fr), are having +their first experience in contributing to an Open Source software by +joining the Git community for a 4-week school project. It was a great +opportunity to participate in a useful non-academic project and to +practice what we’ve learned at school. + +To get to know the Git community, we started with simple improvements: +using `-` as a shortcut for `@{-1}` for `git worktree add`, adding CSS +pattern for `git diff ` and using the parser API for `git upload-pack`. +Part of the job was also to start discussions on different subjects: +how to setup a Triangular Workflow, about the consistency of the +documentation and its readability concerning literals... + +One of our main work was to implement a feature that allows to easily +reply to a given email with the `git send-email` command: it populates +appropriate header (`To:` / `Cc:` / …) and cites the given message +body. Another one was to add the symmetrical of `git push --set-upstream` +to `git pull`. We also worked on a deny policy to prevent accidental +pushes to unwanted remote using a blacklist/whitelist list +feature. Some of us improved the strbuf API by using stack-allocated +memory instead of heap-allocated to avoid malloc and free. + +It was a great experience to face real practical issues when it comes +to developing a software with thousands other developers all around +the world. We’ve learned a lot about rigor and communication which +really were at the center of our work. Maybe we’ll see each other +again on the mailing list since some of us are willing to finish the +patch they were working on and possibly continue the adventure. + +We also all wanted to thank Git folks for the time they spent +reviewing our patches and helping us. But for sure, launching a git command will never feel the same ;-) @@ -244,4 +267,6 @@ __Git tools and sites__ This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from Duy Nguyen and Matthieu Moy. +with help from Duy Nguyen, Matthieu Moy, François Beutin, Jordan de +Gea, William Duclot, Samuel Groot, Erwan Mathoniere, Antoine Queru, +Simon Rabourg and Tom Russello. From 3462af694e109429caf02070d49a43bfa01444f2 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 13 Jun 2016 15:28:02 +0200 Subject: [PATCH 0066/2664] Rev News 16: mention the 2.8.x and 2.9.0-rcx releases Signed-off-by: Johannes Schindelin --- rev_news/drafts/edition-16.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 02695b3197..0144a7d92c 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -247,6 +247,9 @@ itself so I don't have extra dependencies :) ## Releases +* Git [2.8.3](http://article.gmane.org/gmane.comp.version-control.git/295081) and [2.8.4](http://article.gmane.org/gmane.linux.kernel/2236998). +* Git for Windows [2.8.3](https://groups.google.com/forum/#!topic/git-for-windows/P008PLusCxw) and [2.8.4](https://groups.google.com/forum/#!topic/git-for-windows/LtFxynlPdAc). +* Git release candidates [2.9.0-rc0](http://article.gmane.org/gmane.comp.version-control.git/295407), [2.9.0-rc1](http://article.gmane.org/gmane.linux.kernel/2231742) and [2.9.0-rc2](http://article.gmane.org/gmane.linux.kernel/2236999). * git-multimail [1.3.0](https://github.com/git-multimail/git-multimail/releases/tag/1.3.0) and [1.3.1](https://github.com/git-multimail/git-multimail/releases/tag/1.3.1) were released, with a focus on options to customize emails, more documentation and From 987fa83cde057e4013c00b95efe85c418dbb4d4d Mon Sep 17 00:00:00 2001 From: Matthieu Moy Date: Tue, 14 Jun 2016 14:47:38 +0200 Subject: [PATCH 0067/2664] rev-news: add 2.9.0 release, differenciate major/bugfix releases --- rev_news/drafts/edition-16.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 0144a7d92c..253caf5871 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -247,9 +247,10 @@ itself so I don't have extra dependencies :) ## Releases -* Git [2.8.3](http://article.gmane.org/gmane.comp.version-control.git/295081) and [2.8.4](http://article.gmane.org/gmane.linux.kernel/2236998). -* Git for Windows [2.8.3](https://groups.google.com/forum/#!topic/git-for-windows/P008PLusCxw) and [2.8.4](https://groups.google.com/forum/#!topic/git-for-windows/LtFxynlPdAc). -* Git release candidates [2.9.0-rc0](http://article.gmane.org/gmane.comp.version-control.git/295407), [2.9.0-rc1](http://article.gmane.org/gmane.linux.kernel/2231742) and [2.9.0-rc2](http://article.gmane.org/gmane.linux.kernel/2236999). +* Git [2.9.0](http://article.gmane.org/gmane.linux.kernel/2242820) (major release). +* Git for Windows [2.9.0](http://article.gmane.org/gmane.comp.version-control.git/297287) (major release). +* Git [2.8.3](http://article.gmane.org/gmane.comp.version-control.git/295081) and [2.8.4](http://article.gmane.org/gmane.linux.kernel/2236998) (bugfix releases). +* Git for Windows [2.8.3](https://groups.google.com/forum/#!topic/git-for-windows/P008PLusCxw) and [2.8.4](https://groups.google.com/forum/#!topic/git-for-windows/LtFxynlPdAc) (bugfix releases). * git-multimail [1.3.0](https://github.com/git-multimail/git-multimail/releases/tag/1.3.0) and [1.3.1](https://github.com/git-multimail/git-multimail/releases/tag/1.3.1) were released, with a focus on options to customize emails, more documentation and From 9027d57626976172ff85a4d0c8b591b269fb59ca Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 14 Jun 2016 22:37:26 +0200 Subject: [PATCH 0068/2664] rn-16: s/bugfix/maintenance/ Thanks to @gitster for suggesting this. --- rev_news/drafts/edition-16.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 253caf5871..57d16ba38c 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -249,8 +249,8 @@ itself so I don't have extra dependencies :) * Git [2.9.0](http://article.gmane.org/gmane.linux.kernel/2242820) (major release). * Git for Windows [2.9.0](http://article.gmane.org/gmane.comp.version-control.git/297287) (major release). -* Git [2.8.3](http://article.gmane.org/gmane.comp.version-control.git/295081) and [2.8.4](http://article.gmane.org/gmane.linux.kernel/2236998) (bugfix releases). -* Git for Windows [2.8.3](https://groups.google.com/forum/#!topic/git-for-windows/P008PLusCxw) and [2.8.4](https://groups.google.com/forum/#!topic/git-for-windows/LtFxynlPdAc) (bugfix releases). +* Git [2.8.3](http://article.gmane.org/gmane.comp.version-control.git/295081) and [2.8.4](http://article.gmane.org/gmane.linux.kernel/2236998) (maintenance releases). +* Git for Windows [2.8.3](https://groups.google.com/forum/#!topic/git-for-windows/P008PLusCxw) and [2.8.4](https://groups.google.com/forum/#!topic/git-for-windows/LtFxynlPdAc) (maintenance releases). * git-multimail [1.3.0](https://github.com/git-multimail/git-multimail/releases/tag/1.3.0) and [1.3.1](https://github.com/git-multimail/git-multimail/releases/tag/1.3.1) were released, with a focus on options to customize emails, more documentation and From 5056068cd45fbcf960b8cacf319c2cafbe5f3fc5 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 15 Jun 2016 00:06:32 +0200 Subject: [PATCH 0069/2664] rn-16: add releases and links --- rev_news/drafts/edition-16.md | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 57d16ba38c..6d96935dbc 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -255,17 +255,41 @@ itself so I don't have extra dependencies :) [1.3.1](https://github.com/git-multimail/git-multimail/releases/tag/1.3.1) were released, with a focus on options to customize emails, more documentation and a few SMTP-related improvements. +* libgit2/nodegit [v0.13.2](https://github.com/nodegit/nodegit/releases/tag/v0.13.2) +* libgit2/rugged [v0.25.0b4](https://github.com/libgit2/rugged/releases/tag/v0.25.0b4) +* GitLab [8.8](https://about.gitlab.com/2016/05/22/gitlab-8-8-released/) with Pipelines and .gitignore templates, patched up to [8.8.4](https://about.gitlab.com/2016/06/09/gitlab-8-dot-8-dot-4-released/) +* Deveo [3.10](http://blog.deveo.com/whats-new-in-deveo-3-10/) ## Other News __Various__ +* [Git 2.9 has been released](https://github.com/blog/2188-git-2-9-has-been-released) by Peff +* [Rebase a Pull Request without access on the Fork](https://medium.com/@p.tournaris/git-rebase-a-pull-request-without-access-on-the-fork-a4189bac81b9) told by Pavlos-Petros Tournaris +* Some really cool new Git subcommands from Adam Spiers: [new git splice subcommand for non interactive branch splicing](http://article.gmane.org/gmane.comp.version-control.git/295755) +* [Who Needs Git When You Got ZFS?](http://zef.me/blog/6023/who-needs-git-when-you-got-zfs) Zef Hemel asks. We do, but ZFS is still interesting. +* [Easily Adding Meta Information to Git Branches](https://iinteractive.com/notebook/2016/05/25/git-mo-meta.html) by Yanick Champoux +* [Display git branch in Windows command prompt](https://www.nu42.com/2016/05/display-git-branch-windows-command-prompt.html) in the simplest way, by A. Sinan Unur +* [Solutions to useful git scenarios](http://masukomi.org/talks/git_tips_talk), a presentation? Mindmap? By Kay Rhodes +* [git-tips/tips: Most commonly used git tips and tricks](https://github.com/git-tips/tips) - not sure if we shared this one before -__Light reading__ +__Some challenging ideas__ + +* [Subversion vs. Git: Myths and Facts](https://svnvsgit.com) +* [Unorthodocs: Abandon your DVCS and Return to Sanity](https://bitquabit.com/post/unorthodocs-abandon-your-dvcs-and-return-to-sanity) __Git tools and sites__ +* [Git Trident is an iOS client for GitLab and GitHub](http://somerobots.com) +* [splitsh/lite: Split your monorepo into many repos](https://github.com/splitsh/lite) +* [donnemartin/gitsome: A Supercharged Git/Shell Autocompleter with GitHub Integration.](https://github.com/donnemartin/gitsome) +* [kovetskiy/manul: The madness vendoring utility for Golang programs](https://github.com/kovetskiy/manul) +* [buunguyen/octotree: Code tree for GitHub and GitLab](https://github.com/buunguyen/octotree) +* [git squash-check](http://rwilcox.tumblr.com/post/144980240814/git-squash-check) +* [reenhanced/gitreflow: automates your pull request workflow](https://github.com/reenhanced/gitreflow) +* [Fork - a fast and friendly git client for Mac](https://git-fork.com/) +* [karandesai-96/yolog: Beautify your Git Logs](https://github.com/karandesai-96/yolog) ## Credits From 0cdeb79079b18ff6be8b01207b9fcd1ada234bcb Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 15 Jun 2016 06:01:08 +0200 Subject: [PATCH 0070/2664] rn-16: add Sharness 1.0.0 release --- rev_news/drafts/edition-16.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 6d96935dbc..de57e5bdba 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -255,6 +255,9 @@ itself so I don't have extra dependencies :) [1.3.1](https://github.com/git-multimail/git-multimail/releases/tag/1.3.1) were released, with a focus on options to customize emails, more documentation and a few SMTP-related improvements. +* Sharness [1.0.0](https://github.com/chriscool/sharness/releases/tag/v1.0.0), + a shell library to test your tools like Git does, was released and + [announced on the mailing list](http://thread.gmane.org/gmane.comp.version-control.git/297324). * libgit2/nodegit [v0.13.2](https://github.com/nodegit/nodegit/releases/tag/v0.13.2) * libgit2/rugged [v0.25.0b4](https://github.com/libgit2/rugged/releases/tag/v0.25.0b4) * GitLab [8.8](https://about.gitlab.com/2016/05/22/gitlab-8-8-released/) with Pipelines and .gitignore templates, patched up to [8.8.4](https://about.gitlab.com/2016/06/09/gitlab-8-dot-8-dot-4-released/) From acb48d5270f02935c68514891966ad93561cbdd5 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 15 Jun 2016 06:11:03 +0200 Subject: [PATCH 0071/2664] rn-16: add 'Mastering Git' book --- rev_news/drafts/edition-16.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index de57e5bdba..962530f559 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -268,6 +268,7 @@ itself so I don't have extra dependencies :) __Various__ * [Git 2.9 has been released](https://github.com/blog/2188-git-2-9-has-been-released) by Peff +* [New "Mastering Git" book](https://www.packtpub.com/application-development/mastering-git) by long time Git contributor Jakub Narębski * [Rebase a Pull Request without access on the Fork](https://medium.com/@p.tournaris/git-rebase-a-pull-request-without-access-on-the-fork-a4189bac81b9) told by Pavlos-Petros Tournaris * Some really cool new Git subcommands from Adam Spiers: [new git splice subcommand for non interactive branch splicing](http://article.gmane.org/gmane.comp.version-control.git/295755) * [Who Needs Git When You Got ZFS?](http://zef.me/blog/6023/who-needs-git-when-you-got-zfs) Zef Hemel asks. We do, but ZFS is still interesting. From 3e0e5813540769681c1b3748dbf0d5616c1e4ef9 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 15 Jun 2016 06:19:10 +0200 Subject: [PATCH 0072/2664] rn-16: add Dscho, Peff and Gitster among helpers --- rev_news/drafts/edition-16.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-16.md b/rev_news/drafts/edition-16.md index 962530f559..59305f88b6 100644 --- a/rev_news/drafts/edition-16.md +++ b/rev_news/drafts/edition-16.md @@ -299,6 +299,5 @@ __Git tools and sites__ This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from Duy Nguyen, Matthieu Moy, François Beutin, Jordan de -Gea, William Duclot, Samuel Groot, Erwan Mathoniere, Antoine Queru, -Simon Rabourg and Tom Russello. +with help from Duy Nguyen, Matthieu Moy, Johannes Schindelin, Jeff King, Junio Hamano, François Beutin, +Jordan de Gea, William Duclot, Samuel Groot, Erwan Mathoniere, Antoine Queru, Simon Rabourg and Tom Russello. From bf6efe3cbe2b45a42017edb86d2e42a7ac1c433f Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 15 Jun 2016 12:28:19 +0200 Subject: [PATCH 0073/2664] Publish Git Rev News edition 16 in _posts/ --- .../drafts/edition-16.md => _posts/2016-06-15-edition-16.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-16.md => _posts/2016-06-15-edition-16.markdown (100%) diff --git a/rev_news/drafts/edition-16.md b/_posts/2016-06-15-edition-16.markdown similarity index 100% rename from rev_news/drafts/edition-16.md rename to _posts/2016-06-15-edition-16.markdown From 34a9500e5b37e8dcf430a362a61931bc4a5beff7 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 15 Jun 2016 12:29:57 +0200 Subject: [PATCH 0074/2664] rn-16: fix publication date --- _posts/2016-06-15-edition-16.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2016-06-15-edition-16.markdown b/_posts/2016-06-15-edition-16.markdown index 59305f88b6..3c15168f9e 100644 --- a/_posts/2016-06-15-edition-16.markdown +++ b/_posts/2016-06-15-edition-16.markdown @@ -1,7 +1,7 @@ --- title: Git Rev News Edition 16 (June 15th, 2016) layout: default -date: 2016-06-15 21:06:51 +0100 +date: 2016-06-15 12:20:51 +0100 author: chriscool categories: [news] navbar: false From f60acd62f92175b18717b0082ed7a72355c67347 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 11 May 2016 17:03:25 +0200 Subject: [PATCH 0075/2664] Add draft for rn-16 --- rev_news/drafts/edition-17.md | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 rev_news/drafts/edition-17.md diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md new file mode 100644 index 0000000000..2306c68d42 --- /dev/null +++ b/rev_news/drafts/edition-17.md @@ -0,0 +1,50 @@ +--- +title: Git Rev News Edition 17 (XXX, 2016) +layout: default +date: 2016-07-13 21:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 17 (XXX, 2016) + +Welcome to the 17th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). + +This edition covers what happened during the month of June 2016. + +## Discussions + + + + + + + +## Releases + + +## Other News + +__Various__ + + +__Light reading__ + + +__Git tools and sites__ + + +## Credits + +This edition of Git Rev News was curated by Christian Couder <>, +Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, +with help from XXX. From 87cef97b406162502f186120ac093fbc6cdcda67 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Thu, 14 Jul 2016 23:01:07 +0200 Subject: [PATCH 0076/2664] rn-17: set publication date to July 20th --- rev_news/drafts/edition-17.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index 2306c68d42..c065674c65 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -1,13 +1,13 @@ --- -title: Git Rev News Edition 17 (XXX, 2016) +title: Git Rev News Edition 17 (July 20th, 2016) layout: default -date: 2016-07-13 21:06:51 +0100 +date: 2016-07-20 21:06:51 +0100 author: chriscool categories: [news] navbar: false --- -## Git Rev News: Edition 17 (XXX, 2016) +## Git Rev News: Edition 17 (July 20th, 2016) Welcome to the 17th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to From 1aa5996be49ae718c30d51b4b413e07b3d61f144 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 16 Jul 2016 23:12:11 +0200 Subject: [PATCH 0077/2664] rn-17: add Eric's more archives announcement --- rev_news/drafts/edition-17.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index c065674c65..44ce569307 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -36,6 +36,7 @@ This edition covers what happened during the month of June 2016. __Various__ +* [New archives of the Git Mailing list have been announced](http://thread.gmane.org/gmane.comp.version-control.git/299195/) by Eric Wong. __Light reading__ From 3f5e4c8d08dbc86ddfb38c11c7e6ff2e2629ce96 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 16 Jul 2016 23:17:27 +0200 Subject: [PATCH 0078/2664] rn-17: add Jakub's user survey questions RFC --- rev_news/drafts/edition-17.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index 44ce569307..e4309a0731 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -37,6 +37,7 @@ This edition covers what happened during the month of June 2016. __Various__ * [New archives of the Git Mailing list have been announced](http://thread.gmane.org/gmane.comp.version-control.git/299195/) by Eric Wong. +* [An RFC about questions for "Git User's Survey 2016" has been posted](http://thread.gmane.org/gmane.comp.version-control.git/299032/) by Jakub Narębski. __Light reading__ From 3b34f678b36a1f423b862f84aed1aecea11758ea Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 16 Jul 2016 23:45:09 +0200 Subject: [PATCH 0079/2664] rn-17: add 'snapshot' article --- rev_news/drafts/edition-17.md | 45 +++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index e4309a0731..4db3982eab 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -25,9 +25,50 @@ This edition covers what happened during the month of June 2016. ### Reviews --> - + +* [Fwd: what is a snapshot](http://thread.gmane.org/gmane.comp.version-control.git/297701/) + +Ovatta Bianca asked: + +> I read in every comparison of git vs other version control systems, +> that git does not record differences but takes "snapshots" +> I was wondering what a "snapshot" is? Does git store at every commit +> the entire files which have been modified even if only a few bytes +> were changed out of a large file? + +Philip Oakley answered: + +> A snaphot is like a tar or zip of all your tracked files. This means it is +> easier to determine (compared to lots of diffs) the current content. +> +> Keeping all the snapshots as separate loose items, when the majority of +> their content is unchanged would be very inefficient, so git then uses, at +> the right time, an efficient (and obviously lossless) compression technique +> to 'zip' all the snapshots together so that the final repository is +> 'packed'. The overall effect is a very efficient storage scheme. + +and pointed to [some documentation on Git's web site](https://git-scm.com/book/en/v2/Git-Internals-Plumbing-and-Porcelain) +for "some good explanations". + +Jeff King alias Peff explained how the relationship between Git +objects already makes things efficient: + +> Each commit is a snapshot in that it points to the sha1 of the root +> tree, which points to the sha1 of other trees and blobs. And following +> that chain gives you the whole state of the tree, without having to care +> about other commits. +> +> And if the next commit changes only a few files, the sha1 for all the +> other files will remain unchanged, and git does not need to store them +> again. So already, before any explicit compression has happened, we get +> de-duplication of identical content from commit to commit, at the file +> and tree level. +> +> And then when a file does change, we store the whole new version, then +> delta compress it during "git gc", etc, as you describe. + +And Jakub Narębski detailed the "loose" and the "packed" format. ## Releases From 9313ffe7201ac71766b9c108ea0f13b4d645e8f6 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 17 Jul 2016 21:37:45 +0200 Subject: [PATCH 0080/2664] rn-17: add git subtree article --- rev_news/drafts/edition-17.md | 81 ++++++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index 4db3982eab..ec038d9f35 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -21,9 +21,86 @@ This edition covers what happened during the month of June 2016. ### General --> - + +* [contrib/subtree: Remove --annotate](http://thread.gmane.org/gmane.comp.version-control.git/283340/) + +Last January David Greene, who maintains git-subtree.sh, sent +[a patch series](http://thread.gmane.org/gmane.comp.version-control.git/283268/) +to remove the `--annotate` option from `git subtree` and then +[a version 2 of this patch series](http://thread.gmane.org/gmane.comp.version-control.git/283340/). + +This came after previous work to add `--unannotate` some years ago +[in 2012](http://thread.gmane.org/gmane.comp.version-control.git/207341/) and +[in 2013](http://thread.gmane.org/gmane.comp.version-control.git/212954/focus=212961). + +The reason why adding `--unannotate` has not been pursued is that it +is "difficult to define due to the numerous ways one might want to +specify how to edit commit messages". And `--annotate` is now +considered not well suited to rewriting commit messages compared to +other existing tools like `filter-branch`, `rebase -i` and +`commit --amend` that can be used afterwards. + +Junio replied that the above is usually not a good enough reason to +remove a feature unless it can be shown that nobody is using it. + +David then explained that he doesn't know how much `--annotate` is +used, but that he is willing to first deprecate it and then after some +time remove it. + +He also explained that he is also working on a few other things "that +will involve slight semantic changes" and that he has a plan to move +`git subtree` out of the `contrib` subdirectory of the Git source tree +where it is currently and into the main area where there are all the +non contrib Git commands. + +This move would possibly in the end move some of the maintenance +burden of `git subtree` from David to all the Git developers and +ultimately Junio, but David said that the changes he was planning +would remove some maintainance burden. + +Junio agreed to the removal of `--annotate` and in another mail +detailed the historical purpose of the `contrib` area and what is +expected from code in this area: + +> The contrib/ area was created back when Git was still young and we +> felt that it would be beneficial for building the community if +> contributions to non-core part were also included, encouraging +> developers whose strength are not necessarily in the core part to +> participate in various design-level discussions to grow the +> community faster. Back then, we felt that an obscure standalone +> project outside Git that would help the Git-life of users have a +> much better chance of surviving (and eventually be polished) if we +> had them bundled, even if the code quality and stability were +> sub-par. +> +> Those young days are long gone. A standalone tool that aims to help +> users' Git-life would not just survive but flourish with much more +> certainty, as long as the tool is good. We have enough Git users to +> rely on words-of-mouth these days to ensure their success. +> +> That is why I am very hesitant to add new things to contrib/ these +> days. It is very welcome thought that you are working on improving +> subtree, and eventually moving it out of contrib/. From the point +> of view of the project, either moving up (to be part of the git core +> proper) or moving out (to become an independent project) is far more +> preferreable than the status quo so far that was staying in contrib/ +> (without seeing much changes and slowly but steadily bitrotting). +> +> If the aspiration is to move up to exit, then the quality and +> stability expectation is basically the same as stuff in core, and we +> need to strive to keep it stable and high quality. + +Recently David replied to the above: + +> This is the strategy I was planning to pursue. After extensive +> experience with git-subtree and some local enhancements I have in +> real-world work, I am convinced it is a great complementary tool to +> git-submodule. It seems odd to me to have one in core and one not. + +And David also detailled some of the work he plans to do on `git +subtree`. ### Support From d2eb8fbbb30594d19fcda731c309ad03229dc5d5 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 13 Jun 2016 15:28:02 +0200 Subject: [PATCH 0081/2664] Rev News 17: mention the 2.9.[12] releases Signed-off-by: Johannes Schindelin --- rev_news/drafts/edition-17.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index ec038d9f35..ce8ba4cfb1 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -149,6 +149,8 @@ And Jakub Narębski detailed the "loose" and the "packed" format. ## Releases +* Git [2.9.1](http://article.gmane.org/gmane.linux.kernel/2263540) (major release), followed by Git [2.9.2](http://article.gmane.org/gmane.linux.kernel/2267451) that fixes a regression on 32-bit and on Windows. +* Git for Windows [2.9.2](http://article.gmane.org/gmane.comp.version-control.git/299684) (major release, skipping 2.9.1). ## Other News From df8127008a89c604de6930cf0482a1ce6c3c465a Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 18 Jul 2016 16:04:05 +0200 Subject: [PATCH 0082/2664] Some light reading for the Rev News Signed-off-by: Johannes Schindelin --- rev_news/drafts/edition-17.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index ce8ba4cfb1..0ab6746853 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -161,6 +161,8 @@ __Various__ __Light reading__ +* [You should not blindly copy/paste `git clone` instructions from random websites](http://thejh.net/misc/website-terminal-copy-paste) by Jann Horn. +* [To push, to pull- to fetch, perchance to commit. Aye, there's the rub](https://github.com/ipfs/js-ipfs-examples/issues/1#issuecomment-229005498) by Richard Littauer. __Git tools and sites__ From 118a98c8027c0c8419b8468175fe4f9566ae906f Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Tue, 19 Jul 2016 00:14:32 +0200 Subject: [PATCH 0083/2664] rn-17: add some links and releases --- rev_news/drafts/edition-17.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index 0ab6746853..aa2eadf530 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -151,6 +151,11 @@ And Jakub Narębski detailed the "loose" and the "packed" format. * Git [2.9.1](http://article.gmane.org/gmane.linux.kernel/2263540) (major release), followed by Git [2.9.2](http://article.gmane.org/gmane.linux.kernel/2267451) that fixes a regression on 32-bit and on Windows. * Git for Windows [2.9.2](http://article.gmane.org/gmane.comp.version-control.git/299684) (major release, skipping 2.9.1). +* [nodegit/nodegit v0.15.1](https://github.com/nodegit/nodegit/releases/tag/v0.15.1) +* [libgit2/pygit2 v0.24.1](https://github.com/libgit2/pygit2/releases/tag/v0.24.1) +* [JGit/EGit Release 4.4.1](http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg03176.html) +* [GitLab 8.9](https://about.gitlab.com/2016/06/22/gitlab-8-9-released/) and patches until [8.9.6](https://about.gitlab.com/2016/07/11/gitlab-8-dot-9-dot-6-released/) + ## Other News @@ -163,9 +168,21 @@ __Light reading__ * [You should not blindly copy/paste `git clone` instructions from random websites](http://thejh.net/misc/website-terminal-copy-paste) by Jann Horn. * [To push, to pull- to fetch, perchance to commit. Aye, there's the rub](https://github.com/ipfs/js-ipfs-examples/issues/1#issuecomment-229005498) by Richard Littauer. +* [A tutorial on how to use git submodule to share a model across multiple applications](https://github.com/NebuPookins/git-submodule-tutorial) by NebuPookins +* [The Power of Git - Forge'it](https://blog.4ge.it/the-power-of-git/) by Caner Candan +* [twenty years of free software -- part 7 git-annex](http://joeyh.name/blog/entry/twenty_years_of_free_software_--_part_7_git-annex/) a note from Joey Hess +* [On the Matter of Beautiful git Diffs](http://nathanleclaire.com/blog/2016/06/28/on-the-matter-of-beautiful-git-diffs/) by Nathan LeClaire +* [git fixup: --amend for older commits](https://blog.filippo.io/git-fixup-amending-an-older-commit/) by Filippo Valsorda +* [Why Google Stores Billions of Lines of Code in a Single Repository](http://m.cacm.acm.org/magazines/2016/7/204032-why-google-stores-billions-of-lines-of-code-in-a-single-repository/fulltext) by Rachel Potvin and Josh Levenberg +* [Parallelize Development Using Git Worktrees](https://spin.atomicobject.com/2016/06/26/parallelize-development-git-worktrees/) by Brian Vanderwal +* [Permanently Remove Any Record of a File From git](https://chrisshort.net/permanently-remove-any-record-of-a-file-from-git/) by Chris Short + __Git tools and sites__ +* [Cycligent GIT TOOL](https://www.cycligent.com/git-tool) +* [Mango: Git completely decentralised — Medium](https://medium.com/@alexberegszaszi/mango-git-completely-decentralised-7aef8bcbcfe6#.g2shzuxlp) +* [karandesai-96/yolog: Beautify your Git Logs](https://github.com/karandesai-96/yolog) ## Credits From f2eb540a048449fdedb35ff596a81c52758a8afb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Tue, 19 Jul 2016 16:11:45 +0200 Subject: [PATCH 0084/2664] Stylistic change, to avoid duplicated "move" in a sentence --- rev_news/drafts/edition-17.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index aa2eadf530..86474b5dd2 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -55,7 +55,7 @@ will involve slight semantic changes" and that he has a plan to move where it is currently and into the main area where there are all the non contrib Git commands. -This move would possibly in the end move some of the maintenance +This change would possibly in the end move some of the maintenance burden of `git subtree` from David to all the Git developers and ultimately Junio, but David said that the changes he was planning would remove some maintainance burden. From 0414f230c09fa602988884f36b3615d32cab7ba3 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Jul 2016 07:47:38 +0200 Subject: [PATCH 0085/2664] rn-17: add light readings suggested by Jakub --- rev_news/drafts/edition-17.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index 86474b5dd2..1cb105191f 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -176,6 +176,8 @@ __Light reading__ * [Why Google Stores Billions of Lines of Code in a Single Repository](http://m.cacm.acm.org/magazines/2016/7/204032-why-google-stores-billions-of-lines-of-code-in-a-single-repository/fulltext) by Rachel Potvin and Josh Levenberg * [Parallelize Development Using Git Worktrees](https://spin.atomicobject.com/2016/06/26/parallelize-development-git-worktrees/) by Brian Vanderwal * [Permanently Remove Any Record of a File From git](https://chrisshort.net/permanently-remove-any-record-of-a-file-from-git/) by Chris Short +* [Common Git Scenarios"](http://www.masukomi.org/talks/git_tips_talk/#/step-1) an interactive presentation by Masukomi A.K.A. Kay Rhodes +* [Making open source data more available](https://github.com/blog/2201-making-open-source-data-more-available) by Arfon Smith for GitHub __Git tools and sites__ From 019925450906cccce00cb31e09beb424caf57fbe Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Jul 2016 07:51:13 +0200 Subject: [PATCH 0086/2664] rn-17 added missing full stops --- rev_news/drafts/edition-17.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index 1cb105191f..cb0142b726 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -168,16 +168,16 @@ __Light reading__ * [You should not blindly copy/paste `git clone` instructions from random websites](http://thejh.net/misc/website-terminal-copy-paste) by Jann Horn. * [To push, to pull- to fetch, perchance to commit. Aye, there's the rub](https://github.com/ipfs/js-ipfs-examples/issues/1#issuecomment-229005498) by Richard Littauer. -* [A tutorial on how to use git submodule to share a model across multiple applications](https://github.com/NebuPookins/git-submodule-tutorial) by NebuPookins -* [The Power of Git - Forge'it](https://blog.4ge.it/the-power-of-git/) by Caner Candan -* [twenty years of free software -- part 7 git-annex](http://joeyh.name/blog/entry/twenty_years_of_free_software_--_part_7_git-annex/) a note from Joey Hess -* [On the Matter of Beautiful git Diffs](http://nathanleclaire.com/blog/2016/06/28/on-the-matter-of-beautiful-git-diffs/) by Nathan LeClaire -* [git fixup: --amend for older commits](https://blog.filippo.io/git-fixup-amending-an-older-commit/) by Filippo Valsorda -* [Why Google Stores Billions of Lines of Code in a Single Repository](http://m.cacm.acm.org/magazines/2016/7/204032-why-google-stores-billions-of-lines-of-code-in-a-single-repository/fulltext) by Rachel Potvin and Josh Levenberg -* [Parallelize Development Using Git Worktrees](https://spin.atomicobject.com/2016/06/26/parallelize-development-git-worktrees/) by Brian Vanderwal -* [Permanently Remove Any Record of a File From git](https://chrisshort.net/permanently-remove-any-record-of-a-file-from-git/) by Chris Short -* [Common Git Scenarios"](http://www.masukomi.org/talks/git_tips_talk/#/step-1) an interactive presentation by Masukomi A.K.A. Kay Rhodes -* [Making open source data more available](https://github.com/blog/2201-making-open-source-data-more-available) by Arfon Smith for GitHub +* [A tutorial on how to use git submodule to share a model across multiple applications](https://github.com/NebuPookins/git-submodule-tutorial) by NebuPookins. +* [The Power of Git - Forge'it](https://blog.4ge.it/the-power-of-git/) by Caner Candan. +* [twenty years of free software -- part 7 git-annex](http://joeyh.name/blog/entry/twenty_years_of_free_software_--_part_7_git-annex/) a note from Joey Hess. +* [On the Matter of Beautiful git Diffs](http://nathanleclaire.com/blog/2016/06/28/on-the-matter-of-beautiful-git-diffs/) by Nathan LeClaire. +* [git fixup: --amend for older commits](https://blog.filippo.io/git-fixup-amending-an-older-commit/) by Filippo Valsorda. +* [Why Google Stores Billions of Lines of Code in a Single Repository](http://m.cacm.acm.org/magazines/2016/7/204032-why-google-stores-billions-of-lines-of-code-in-a-single-repository/fulltext) by Rachel Potvin and Josh Levenberg. +* [Parallelize Development Using Git Worktrees](https://spin.atomicobject.com/2016/06/26/parallelize-development-git-worktrees/) by Brian Vanderwal. +* [Permanently Remove Any Record of a File From git](https://chrisshort.net/permanently-remove-any-record-of-a-file-from-git/) by Chris Short. +* [Common Git Scenarios"](http://www.masukomi.org/talks/git_tips_talk/#/step-1) an interactive presentation by Masukomi A.K.A. Kay Rhodes. +* [Making open source data more available](https://github.com/blog/2201-making-open-source-data-more-available) by Arfon Smith for GitHub. __Git tools and sites__ From fabe801404a09249b0e085fe8736e213e0d38c6e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Jul 2016 07:53:26 +0200 Subject: [PATCH 0087/2664] rn-17: add Jakub and Dscho among helpers --- rev_news/drafts/edition-17.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index cb0142b726..54aff0e61b 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -190,4 +190,4 @@ __Git tools and sites__ This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from XXX. +with help from Jakub Narębski and Johannes Schindelin. From 338448e4354a87b355c24f13f58b35deb135a568 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Jul 2016 08:31:29 +0200 Subject: [PATCH 0088/2664] rn-17: add Jakub's interview --- rev_news/drafts/edition-17.md | 137 ++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index 54aff0e61b..9d2e539204 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -147,6 +147,143 @@ objects already makes things efficient: And Jakub Narębski detailed the "loose" and the "packed" format. + +## Developer Spotlight: Jakub Narębski + +* Who are you and what do you do? + +I'm an occasional contributor to Git, and an unofficial gitweb maintainer; +a physicist turned to compute science. One of first programs that I wrote +was a computer simulation. Currently I am working at the +[Nicolaus Copernicus University in Toruń](http://www.umk.pl/en/). There, among other things, +I teach Git to students, as a part of their coursework. + +I have created, announced and analysed annual Git User's Surveys from +2007 till 2012 (all except the first one). You can find their results on the +[Git Wiki](https://git.wiki.kernel.org/index.php/GitSurvey2012). This year I plan on restarting the survey. + +I am also the author of the [Mastering Git](https://www.packtpub.com/application-development/mastering-git) book published by Packt. + +* What is your book about and why did you write it? + +The goal of the "Mastering Git" book is to help readers get an expert-level +proficiency with modern Git. I wanted to pass the information about +the advanced use of Git, pass my knowledge about it, +and improve their understanding of Git behavior. The idea was +to show useful features (like for example the `git stash` command) +together with explanation on how they work, to attain a deeper understanding, +allowing Git users to be able to create their own solutions for their problems +(like for example extracting file changes from the stash), +based on this understanding of Git, instead of having to rely on ready recipes. + +This book would be not created without Packt. They have found me thanks to +my contributions on StackOverflow and asked for authoring the book on Git +targeting advanced usage, to follow theirs +[Git: Version Control for Everyone](https://git-blame.blogspot.com/2013/02/git-version-control-for-everyone.html). +They were very helpful; this was my first such big work. + +* How did your introduction to Git and involvement in Git project itself came about? + +I have followed Git development from the very beginning of its creation, on +then existing and now defunct KernelTrap and Kernel Traffic sites (and the only +one existing issue of Git Traffic). From there I have moved to looking +on the Git mailing list. Git was so much easier to use and understand than CVS (and RCS) +that I was using then for version control: easy branching, switching branches, +merging, checking out older versions (remember sticky tags and dates?), +atomic commits, peer-to-peer workflows,... + +My very first contribution to Git was an update to gitweb's README in 2006... +and that's how I came to be, a bit of time later, an unofficial gitweb +maintainer ;-) + +* What would you name your most important contribution to Git? + +Certainly my biggest contribution in terms of lines of code, number of commits +and number of patch reviews was my refactoring of gitweb, making it easier +to develop and maintain, while still providing a simple install path; +and providing it with a documentation +([gitweb(1)](https://git.github.io/htmldocs/gitweb.html), +[gitweb.conf(5)](https://git.github.io/htmldocs/gitweb.conf.html)). An +important to me contribution +was adding a configure script for automatic build configuration. + +In terms of impact on Git's user friendliness and usability were probably +(the few) improvements to the documentation. + +* What are you doing on the Git project these days, and why? + +Recently, I've not been contributing much to Git. +I have now returned to the Git mailing list after a long hiatus. I am +currently working and construction and then doing Git User's Survey 2016. +The survey is preliminary planned for the month of September. Therefore +if you want to point it into specific direction, give it certain +focus, or include +a particular question, now it's time to speak. I think it is important avenue +to hear the voice of Git users, to help make Git better for all various use +cases. Also it serves as a nice way to advertise Git capabilities... + +I keep reviewing gitweb patches. My TODO list for gitweb is quite long; +I hope to shorten it some. + +* If you could get a team of expert developers to work full time on something in Git for a full year, what would it be? + +Improving further performance on big repositories would be nice (large +number of file, large binary files, long history, large amount of branches, +tags, replacements and notes). I'd like for it to go through and borrow +ideas from other Git implementations and from other version control +systems. The addition of compressed bitmap indices first to JGit, +then to core-git to speed up cloning shows that there might be good +ideas on how to speed up reachability and least common ancestor +(also known as merge base in Git) queries in computer science papers. + +One hard problem in Git that would probably need such team of experts for +a full year is resumable clone / resumable fetching. It is something that +people want to have, but it turns out it is something really hard to implement +reasonably. It can be worked around by using git bundles, which hopefully +be automated and standarized; but it is still a workaround, not a solution. + +* If you could remove something from Git without worrying about backwards compatibility, what would it be? + +I would make remote-tracking refs fully qualified, that is use for +example `refs/remotes//heads/`. This would make +it easier to fetch remote-local tags, to fetch replacements, notes, +stashes, etc. + +I would also redo and redesign user interface of Git commands. +The bottom-up, "worse is better" approach creates superior features, +but it all too often results in inconsistent and inferior UI. It would +be good to have consistent rules for using commands, subcommands +and options. Currently it is a bit of historical mess; some features +use command options, some subcommands. Some commands are +narrow in scope, some have many different (and weakly related) +modes of operation. + +* What are your favorite Git features? + +My favorite features are (1) the explicit staging area, which allows +disentangling changes to be in the next commit from the state of +the working directory, and which allows splitting commits with +an interactive rebase, and (2) reflogs, which saved me from my +mistakes in handling Git many, many times. + +* What is your favorite Git-related tool/library, outside of Git itself? + +Some time ago I have been using intensively a patch management tool +named [StGit](http://procode.org/stgit/) (Stacked Git). Nowadays I use interactive rebase for nearly +the same purpose, that is cleaning up a series of changes before sending +the new version upstream for the review. It is a bit more cumbersome to +use, but interactive rebase is a built in feature. + +I work mostly with git core tools (with the Git itself), sometimes using +IDE integration with Git, or a graphical commit tool for easier interactive +add. As an administrator, I love [Gitolite](http://gitolite.com/) --- it allows easy creation of +repositories and repository access management, without the need to +bother sysadmins + +One tool that looks interesting, and which I would like to try out, +but didn't have an occasion to use, is the [git-imerge](https://github.com/mhagger/git-imerge). + + ## Releases * Git [2.9.1](http://article.gmane.org/gmane.linux.kernel/2263540) (major release), followed by Git [2.9.2](http://article.gmane.org/gmane.linux.kernel/2267451) that fixes a regression on 32-bit and on Windows. From e4202f4b1dc28f0c7b1d7fb1940d56403b7c6ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Wed, 20 Jul 2016 12:23:14 +0200 Subject: [PATCH 0089/2664] Expand "Making open source data more available" entry Explain what "Making open source data more available" GitHub blog post is about. --- rev_news/drafts/edition-17.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index 9d2e539204..3f08ae1639 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -314,7 +314,7 @@ __Light reading__ * [Parallelize Development Using Git Worktrees](https://spin.atomicobject.com/2016/06/26/parallelize-development-git-worktrees/) by Brian Vanderwal. * [Permanently Remove Any Record of a File From git](https://chrisshort.net/permanently-remove-any-record-of-a-file-from-git/) by Chris Short. * [Common Git Scenarios"](http://www.masukomi.org/talks/git_tips_talk/#/step-1) an interactive presentation by Masukomi A.K.A. Kay Rhodes. -* [Making open source data more available](https://github.com/blog/2201-making-open-source-data-more-available) by Arfon Smith for GitHub. +* [Making open source data more available](https://github.com/blog/2201-making-open-source-data-more-available) by Arfon Smith for GitHub, announcing 3TB+ BigQuery [dataset of GitHub activity in open source repositories](https://cloud.google.com/bigquery/public-data/github). __Git tools and sites__ From d88c67be071f210f2d72c8901285735394b65f61 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Jul 2016 14:39:41 +0200 Subject: [PATCH 0090/2664] rn-17: fix typo near 'Common Git Scenarios' --- rev_news/drafts/edition-17.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-17.md b/rev_news/drafts/edition-17.md index 3f08ae1639..7465d16bec 100644 --- a/rev_news/drafts/edition-17.md +++ b/rev_news/drafts/edition-17.md @@ -313,7 +313,7 @@ __Light reading__ * [Why Google Stores Billions of Lines of Code in a Single Repository](http://m.cacm.acm.org/magazines/2016/7/204032-why-google-stores-billions-of-lines-of-code-in-a-single-repository/fulltext) by Rachel Potvin and Josh Levenberg. * [Parallelize Development Using Git Worktrees](https://spin.atomicobject.com/2016/06/26/parallelize-development-git-worktrees/) by Brian Vanderwal. * [Permanently Remove Any Record of a File From git](https://chrisshort.net/permanently-remove-any-record-of-a-file-from-git/) by Chris Short. -* [Common Git Scenarios"](http://www.masukomi.org/talks/git_tips_talk/#/step-1) an interactive presentation by Masukomi A.K.A. Kay Rhodes. +* [Common Git Scenarios](http://www.masukomi.org/talks/git_tips_talk/#/step-1) an interactive presentation by Masukomi A.K.A. Kay Rhodes. * [Making open source data more available](https://github.com/blog/2201-making-open-source-data-more-available) by Arfon Smith for GitHub, announcing 3TB+ BigQuery [dataset of GitHub activity in open source repositories](https://cloud.google.com/bigquery/public-data/github). From 9cdd13ec2a134eeeeb2293505582306e861f4505 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Jul 2016 14:40:43 +0200 Subject: [PATCH 0091/2664] Publish rn-17 in _posts/ --- .../drafts/edition-17.md => _posts/2016-07-20-edition-17.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-17.md => _posts/2016-07-20-edition-17.markdown (100%) diff --git a/rev_news/drafts/edition-17.md b/_posts/2016-07-20-edition-17.markdown similarity index 100% rename from rev_news/drafts/edition-17.md rename to _posts/2016-07-20-edition-17.markdown From f44e7029a958774be34e6e52dffc1a7c46a274ea Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 11 May 2016 17:03:25 +0200 Subject: [PATCH 0092/2664] Add draft for rn-18 --- rev_news/drafts/edition-18.md | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 rev_news/drafts/edition-18.md diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md new file mode 100644 index 0000000000..d00b110835 --- /dev/null +++ b/rev_news/drafts/edition-18.md @@ -0,0 +1,50 @@ +--- +title: Git Rev News Edition 18 (XXX, 2016) +layout: default +date: 2016-08-17 21:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 18 (XXX, 2016) + +Welcome to the 18th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). + +This edition covers what happened during the month of July 2016. + +## Discussions + + + + + + + +## Releases + + +## Other News + +__Various__ + + +__Light reading__ + + +__Git tools and sites__ + + +## Credits + +This edition of Git Rev News was curated by Christian Couder <>, +Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, +with help from XXX. From cd3f38a96cbd703f47d2d8cee45d180596431ee0 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Jul 2016 14:45:32 +0200 Subject: [PATCH 0093/2664] rn-17: fix publication date --- _posts/2016-07-20-edition-17.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2016-07-20-edition-17.markdown b/_posts/2016-07-20-edition-17.markdown index 7465d16bec..43e6ca8065 100644 --- a/_posts/2016-07-20-edition-17.markdown +++ b/_posts/2016-07-20-edition-17.markdown @@ -1,7 +1,7 @@ --- title: Git Rev News Edition 17 (July 20th, 2016) layout: default -date: 2016-07-20 21:06:51 +0100 +date: 2016-07-20 12:06:51 +0100 author: chriscool categories: [news] navbar: false From 5d50fd0d807d0f8046b712aac1492c30aea7a652 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Jul 2016 22:43:39 +0200 Subject: [PATCH 0094/2664] rn-17: fix major/maintenance mistake --- _posts/2016-07-20-edition-17.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/2016-07-20-edition-17.markdown b/_posts/2016-07-20-edition-17.markdown index 43e6ca8065..fb09b39090 100644 --- a/_posts/2016-07-20-edition-17.markdown +++ b/_posts/2016-07-20-edition-17.markdown @@ -286,8 +286,8 @@ but didn't have an occasion to use, is the [git-imerge](https://github.com/mhagg ## Releases -* Git [2.9.1](http://article.gmane.org/gmane.linux.kernel/2263540) (major release), followed by Git [2.9.2](http://article.gmane.org/gmane.linux.kernel/2267451) that fixes a regression on 32-bit and on Windows. -* Git for Windows [2.9.2](http://article.gmane.org/gmane.comp.version-control.git/299684) (major release, skipping 2.9.1). +* Git [2.9.1](http://article.gmane.org/gmane.linux.kernel/2263540) (maintenance release), followed by Git [2.9.2](http://article.gmane.org/gmane.linux.kernel/2267451) that fixes a regression on 32-bit and on Windows. +* Git for Windows [2.9.2](http://article.gmane.org/gmane.comp.version-control.git/299684) (maintenance release, skipping 2.9.1). * [nodegit/nodegit v0.15.1](https://github.com/nodegit/nodegit/releases/tag/v0.15.1) * [libgit2/pygit2 v0.24.1](https://github.com/libgit2/pygit2/releases/tag/v0.24.1) * [JGit/EGit Release 4.4.1](http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg03176.html) From ae08ca7689b4bc0c55b87edd27641fbe721e3220 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 20 Jul 2016 22:48:06 +0200 Subject: [PATCH 0095/2664] rn-17: fix maintainance/maintenance mistake --- _posts/2016-07-20-edition-17.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2016-07-20-edition-17.markdown b/_posts/2016-07-20-edition-17.markdown index fb09b39090..73e435fb8a 100644 --- a/_posts/2016-07-20-edition-17.markdown +++ b/_posts/2016-07-20-edition-17.markdown @@ -58,7 +58,7 @@ non contrib Git commands. This change would possibly in the end move some of the maintenance burden of `git subtree` from David to all the Git developers and ultimately Junio, but David said that the changes he was planning -would remove some maintainance burden. +would remove some maintenance burden. Junio agreed to the removal of `--annotate` and in another mail detailed the historical purpose of the `contrib` area and what is From d84d6ff7b1920562ab56773e101f422b3af818cf Mon Sep 17 00:00:00 2001 From: Roberto Tyley Date: Fri, 22 Jul 2016 08:54:55 +0100 Subject: [PATCH 0096/2664] Fix broken `Git Rev News page` links in Git Rev news see also https://github.com/git/git.github.io/issues/157 --- _posts/2016-07-20-edition-17.markdown | 4 ++-- rev_news/drafts/edition-18.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_posts/2016-07-20-edition-17.markdown b/_posts/2016-07-20-edition-17.markdown index 73e435fb8a..10df4d4dd4 100644 --- a/_posts/2016-07-20-edition-17.markdown +++ b/_posts/2016-07-20-edition-17.markdown @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 17 (July 20th, 2016) -Welcome to the 17th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +Welcome to the 17th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). This edition covers what happened during the month of June 2016. diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index d00b110835..7e3e89ecf7 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -9,9 +9,9 @@ navbar: false ## Git Rev News: Edition 18 (XXX, 2016) -Welcome to the 18th edition of [Git Rev News](http://git.github.io/rev_news/rev_news.html), +Welcome to the 18th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to -subscribe, see [the Git Rev News page](http://git.github.io/rev_news/rev_news.html) on [git.github.io](http://git.github.io). +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). This edition covers what happened during the month of July 2016. From bd29928940353b45058c51e28aed83a4332ea4fc Mon Sep 17 00:00:00 2001 From: Roberto Tyley Date: Fri, 22 Jul 2016 09:05:59 +0100 Subject: [PATCH 0097/2664] Add write-up of Git Merge 2016 by Roberto Tyley --- rev_news/drafts/edition-18.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index d00b110835..b0e201ba31 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -39,6 +39,7 @@ __Various__ __Light reading__ +* [A slightly delayed write-up of Git Merge 2016 by Roberto Tyley of the Guardian](https://www.theguardian.com/info/developer-blog/2016/jul/02/git-merge-2016) __Git tools and sites__ From a8c4a46a9c4a2a64e8475667badf89a27fddee2b Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Sun, 24 Jul 2016 09:44:28 +0200 Subject: [PATCH 0098/2664] Mention the 'reedited' version of Pro Git (2nd ed) Signed-off-by: Johannes Schindelin --- rev_news/drafts/edition-18.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index 6eee844704..be6d211760 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -36,6 +36,7 @@ This edition covers what happened during the month of July 2016. __Various__ +* A ["Reedited" version](https://github.com/nobozo/progit2) of [*Pro Git 2nd Edition*](https://github.com/progit/progit2) by Jon Forrest __Light reading__ From 67a81e3cea5b3d41c4439afe66c1c4569d897056 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 25 Jul 2016 11:54:49 +0200 Subject: [PATCH 0099/2664] rn-18: add link to Mango article --- rev_news/drafts/edition-18.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index be6d211760..da8f7add7c 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -41,6 +41,7 @@ __Various__ __Light reading__ * [A slightly delayed write-up of Git Merge 2016 by Roberto Tyley of the Guardian](https://www.theguardian.com/info/developer-blog/2016/jul/02/git-merge-2016) +* [Mango: Git completely decentralised](https://medium.com/@alexberegszaszi/mango-git-completely-decentralised-7aef8bcbcfe6) by Alex Beregszaszi. __Git tools and sites__ From df852c89f5d21f8bebdd7da9421162ded1f3547b Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 25 Jul 2016 12:00:30 +0200 Subject: [PATCH 0100/2664] rn-18: fix punctuation and consistency in Other News --- rev_news/drafts/edition-18.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index da8f7add7c..fa569729a0 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -36,12 +36,12 @@ This edition covers what happened during the month of July 2016. __Various__ -* A ["Reedited" version](https://github.com/nobozo/progit2) of [*Pro Git 2nd Edition*](https://github.com/progit/progit2) by Jon Forrest +* A ["Reedited" version](https://github.com/nobozo/progit2) of [*Pro Git 2nd Edition*](https://github.com/progit/progit2) by Jon Forrest. __Light reading__ -* [A slightly delayed write-up of Git Merge 2016 by Roberto Tyley of the Guardian](https://www.theguardian.com/info/developer-blog/2016/jul/02/git-merge-2016) -* [Mango: Git completely decentralised](https://medium.com/@alexberegszaszi/mango-git-completely-decentralised-7aef8bcbcfe6) by Alex Beregszaszi. +* A [slightly delayed write-up of Git Merge 2016](https://www.theguardian.com/info/developer-blog/2016/jul/02/git-merge-2016) by Roberto Tyley of the Guardian. +* [Mango: Git completely decentralised](https://medium.com/@alexberegszaszi/mango-git-completely-decentralised-7aef8bcbcfe6) by Alex Beregszaszi. __Git tools and sites__ From d40afc04bfd4ba6bdacabcdcb8b28aec48afae69 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Tue, 2 Aug 2016 13:51:37 +0200 Subject: [PATCH 0101/2664] Mention that Gmane closed down its web site Signed-off-by: Johannes Schindelin --- rev_news/drafts/edition-18.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index fa569729a0..9f4a6740b0 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -45,6 +45,7 @@ __Light reading__ __Git tools and sites__ +* Gmane (a mailing list archive that was used heavily by some Git developers) [shut down its web site](https://lars.ingebrigtsen.no/2016/07/28/the-end-of-gmane/comment-page-1/#comment-13502). ## Credits From 9cac1528b21897abc0b282670b5bddb77c745ea7 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 12 Aug 2016 17:45:27 +0200 Subject: [PATCH 0102/2664] Rev News: Mention tig 2.2 Signed-off-by: Johannes Schindelin --- rev_news/drafts/edition-18.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index fa569729a0..e59773d8f0 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -31,6 +31,7 @@ This edition covers what happened during the month of July 2016. ## Releases +* Jonas Fonseca [announced tig 2.2](https://public-inbox.org/git/CAFuPQ1%2Bi6BFRH%3D6HUWzDgM7J%2BhL_3hUNv5-4mjjGm%3Dh-YWVuzg%40mail.gmail.com/). ## Other News From d871ff66f699c4f19211ddb2ac3f49b41d1658d5 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Fri, 12 Aug 2016 20:50:46 +0200 Subject: [PATCH 0103/2664] rn-18: set publication date to August 17th --- rev_news/drafts/edition-18.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index bf15d2e070..c922677fa7 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -1,13 +1,13 @@ --- -title: Git Rev News Edition 18 (XXX, 2016) +title: Git Rev News Edition 18 (August 17th, 2016) layout: default -date: 2016-08-17 21:06:51 +0100 +date: 2016-08-17 12:06:51 +0100 author: chriscool categories: [news] navbar: false --- -## Git Rev News: Edition 18 (XXX, 2016) +## Git Rev News: Edition 18 (August 17th, 2016) Welcome to the 18th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to From 2363e59219aa9906a7f07bb690656db57b2403a2 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 14 Aug 2016 11:29:03 +0200 Subject: [PATCH 0104/2664] rn-18: add 'Git filter protocol' article --- rev_news/drafts/edition-18.md | 66 +++++++++++++++++++++++++++++++++-- 1 file changed, 64 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index c922677fa7..5628de97d4 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -21,9 +21,71 @@ This edition covers what happened during the month of July 2016. ### General --> - + +* [Git filter protocol](https://public-inbox.org/git/20160810130411.12419-1-larsxschneider%40gmail.com/) + +Lars Schneider recently sent version 5 of his "Git filter protocol" +patch series. The goal of this series is to avoid launching a new +clean/smudge filter process for each file that should be filtered. + +Only one filter process per Git command should be launched, and this +process should communicate with the Git command using Lars' new filter +protocol. + +This would make Git faster when a large number of files has to +be filtered and when the startup time of a filter process is not +insignificant. + +Lars wants especially to speed up Git-LFS, as Git-LFS works using a +clean/smudge filter to send or get the large files to and from the +special Git-LFS storage, so he also wrote +[a pull request that implements a filter process for Git-LFS](https://github.com/github/git-lfs/pull/1382) +and that uses his new filter protocol. + +On this pull request, Lars reports the following results when +switching branches on OSX with 12,000 Git LFS files: + +``` +Default Git: 6m2.979s + 0m1.310s = 364s +Git and Git LFS with stream filter support: 0m2.528s + 0m2.280s = 5s +``` + +He says that with his filter protocol the operation is almost 70 times +faster and that he expect "even more dramatic results on Windows", as +launching a new process is usually slower on Windows. + +When he started working on this, Lars first sent emails to the mailing +list to get information about +[filter driver code](https://public-inbox.org/git/67D9AC88-550E-4549-9AFD-2401B70B363B%40gmail.com/) +and explanations about +[the fact that clean filter is executed 12 times for 3 files](https://public-inbox.org/git/1469134747-26785-1-git-send-email-larsxschneider%40gmail.com/). + +The discussion following his first email involved Junio Hamano, Jeff +King alias Peff, Torsten Bögershausen and Jakub Narębski, and led to +explanations and then interesting design discussions. + +The discussion following Lars' second email prompted Peff to send +[a patch to fix some useless clean filter invocations](https://public-inbox.org/git/20160722152753.GA6859%40sigill.intra.peff.net/). + +Following those discussions Lars sent the following versions of his patch series: + +- [v1](https://public-inbox.org/git/20160722154900.19477-1-larsxschneider%40gmail.com/), +- [v2](https://public-inbox.org/git/20160727000605.49982-1-larsxschneider%40gmail.com/), +- [v3](https://public-inbox.org/git/20160729233801.82844-1-larsxschneider%40gmail.com/), +- [v4](https://public-inbox.org/git/20160803164225.46355-1-larsxschneider%40gmail.com/), +- [v5](https://public-inbox.org/git/20160810130411.12419-1-larsxschneider%40gmail.com/) + +These series were reviewed or involved a large number of Git +developers, like Ramsay Jones, Remi Galan Alfonso, Eric Wong, Duy +Nguyen, Johannes Sixt, Stefan Beller, Junio, Peff, Torsten, Jakub. + +One especially interesting sub thread was started by Jakub with +[a long email about "Designing the filter process protocol"](https://public-inbox.org/git/607c07fe-5b6f-fd67-13e1-705020c267ee%40gmail.com/). + +Hopefully all this work will eventually be merged and result in great +improvements for some important Git use cases. + +* [Find a topic branch containing a commit](https://public-inbox.org/git/CACsJy8CMnywB8AdmLxB8LnsznHrMTieoezhaQS=2r1pnM8ONZA@mail.gmail.com/) + +Duy asked on the mailing list: + +> Before I start doing anything silly because I don't know it can +> already be done without waving my C wand like a mad man... +> +> I often do this: find a commit of interest, the commit itself is not +> enough so I need a full patch series to figure out what's going, so I +> fire up "git log --graph --oneline" and manually search that commit +> and trace back to the merge point, then I can "git log --patch". Is +> there an automatic way to accomplish that? Something like "git branch +> --contains" (or "git merge --contains")? +> +> PS. Sometimes I wish we could optionally save cover letter in the +> merge commit. Sometimes the "big plan" is hard to see by reading +> individual commit messages. + +Saving the cover letter of a patch series - which is patch 0 in the +series, but is not a real patch, so is not applied - is by the way a +different topic that +[reappeared on the list recently](https://public-inbox.org/git/CA+P7+xpHDGY5RTR8ntrABdxqM6b4V9dndS68=kV1+1Ym1N6YKw@mail.gmail.com/) +and was also discussed following the +[annoucement by Josh Triplett of his new git-series tool](https://public-inbox.org/git/20160729064055.GB25331@x/). + +To the main question about finding the topic branch containing a +commit, Stefan Beller suggested using +[Michael Haggerty's git-when-merged](https://github.com/mhagger/git-when-merged). + +Duy was happy with this tool, but would have liked an option to show +all the commits in a topic branch, for example something that would do +a `git log` from the merge base to the merge point. He also asked +Michael if he had any plan to port it to C and integrate it into Git. + +Michael replied the next day that he had made +[a pull request, which has since be merged, for the new option](https://github.com/mhagger/git-when-merged/pull/13), +but that he had no plan to port it to C. + +Junio also asked for a way to get a more human readable result for +example by running `git show` on the merge commit. ## Releases From a0d5310a6538f5ca1eddc30fe37c5049742f5793 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 14 Aug 2016 19:10:15 +0200 Subject: [PATCH 0106/2664] rn-18: improve git-when-merged article a bit --- rev_news/drafts/edition-18.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index c5b842498f..49eba65d2c 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -125,9 +125,9 @@ Michael if he had any plan to port it to C and integrate it into Git. Michael replied the next day that he had made [a pull request, which has since be merged, for the new option](https://github.com/mhagger/git-when-merged/pull/13), -but that he had no plan to port it to C. +but that he had no plan to port it to C and integrate it into Git. -Junio also asked for a way to get a more human readable result for +Junio also suggested a way to get a more human readable result for example by running `git show` on the merge commit. ## Releases From 66d72b0bd9ef38587dd7d5c4c6825a7984f2f2af Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 15 Aug 2016 08:08:03 +0200 Subject: [PATCH 0107/2664] rn-18: add something about public-inbox --- rev_news/drafts/edition-18.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index 49eba65d2c..b3a47a2a34 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -147,7 +147,13 @@ __Light reading__ __Git tools and sites__ -* Gmane (a mailing list archive that was used heavily by some Git developers) [shut down its web site](https://lars.ingebrigtsen.no/2016/07/28/the-end-of-gmane/comment-page-1/#comment-13502). +* Gmane (a mailing list archive that was used heavily by some Git developers) +[shut down its web site](https://lars.ingebrigtsen.no/2016/07/28/the-end-of-gmane/comment-page-1/#comment-13502). +* [public-inbox](https://public-inbox.org/), which is under heavy developement by Eric Wong, has +[a git archive](https://public-inbox.org/git/) that is now used a lot instead of Gmane. +[It allows](https://public-inbox.org/design_www.html) looking up +existing Gmane links using their Gmane id with URLs like +`http://public-inbox.org/git/?q=gmane:123456`. ## Credits From 942b06c3ec73b94ddd00910c393afcfe4da8088b Mon Sep 17 00:00:00 2001 From: Josh Triplett Date: Sun, 14 Aug 2016 23:46:10 -0700 Subject: [PATCH 0108/2664] edition-18.md: Add the git-series announcement Christian Couder requested that I submit a short item on git-series for the "Git tools and sites" section. --- rev_news/drafts/edition-18.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index b3a47a2a34..e8b262ebd5 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -154,6 +154,7 @@ __Git tools and sites__ [It allows](https://public-inbox.org/design_www.html) looking up existing Gmane links using their Gmane id with URLs like `http://public-inbox.org/git/?q=gmane:123456`. +* Josh Triplett [announced](https://public-inbox.org/git/20160729064055.GB25331@x/) a new git tool, [git-series](https://github.com/git-series/git-series/), to manage patch series with git, tracking the "history of history". git series tracks changes to the patch series over time, including rebases and other non-fast-forwarding changes. git series also tracks a cover letter for the patch series, formats the series for email, and prepares pull requests. This makes it easier to collaborate on a patch series, distribution package, backport, or any other development process that includes rebasing or non-fast-forward development. Josh plans to give a [presentation about git-series at LinuxCon North America](http://sched.co/7JVs). ## Credits From faed15e3d559c39ddeae6327255d4ca9fd68c36b Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Mon, 15 Aug 2016 21:57:13 +0200 Subject: [PATCH 0109/2664] rn-18: add more links and releases --- rev_news/drafts/edition-18.md | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index e8b262ebd5..2c02306bbf 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -132,18 +132,24 @@ example by running `git show` on the merge commit. ## Releases -* Jonas Fonseca [announced tig 2.2](https://public-inbox.org/git/CAFuPQ1%2Bi6BFRH%3D6HUWzDgM7J%2BhL_3hUNv5-4mjjGm%3Dh-YWVuzg%40mail.gmail.com/). + +* Jonas Fonseca [announced tig 2.2](https://public-inbox.org/git/CAFuPQ1%2Bi6BFRH%3D6HUWzDgM7J%2BhL_3hUNv5-4mjjGm%3Dh-YWVuzg%40mail.gmail.com/), see also the [release page](https://github.com/jonas/tig/releases/tag/tig-2.2) +* [GitLab 8.10](https://about.gitlab.com/2016/07/22/gitlab-8-10-released/) through [8.10.3](https://about.gitlab.com/2016/08/01/gitlab-8-dot-10-dot-3-released/) +* [GitHub Enterprise 2.7](https://github.com/blog/2214-github-enterprise-2-7-is-now-available-with-enhanced-security-and-more-powerful-apis) ## Other News __Various__ -* A ["Reedited" version](https://github.com/nobozo/progit2) of [*Pro Git 2nd Edition*](https://github.com/progit/progit2) by Jon Forrest. +* A ["Reedited" version](https://github.com/nobozo/progit2) of [*Pro Git 2nd Edition*](https://github.com/progit/progit2) by Jon Forrest +* Author of git-annex, Joey Hess has [launched a Patreon page to support continued development on his open source projects](https://www.patreon.com/joeyh) __Light reading__ -* A [slightly delayed write-up of Git Merge 2016](https://www.theguardian.com/info/developer-blog/2016/jul/02/git-merge-2016) by Roberto Tyley of the Guardian. -* [Mango: Git completely decentralised](https://medium.com/@alexberegszaszi/mango-git-completely-decentralised-7aef8bcbcfe6) by Alex Beregszaszi. +* A [slightly delayed write-up of Git Merge 2016](https://www.theguardian.com/info/developer-blog/2016/jul/02/git-merge-2016) by Roberto Tyley of the Guardian +* [Mango: Git completely decentralised](https://medium.com/@alexberegszaszi/mango-git-completely-decentralised-7aef8bcbcfe6) by Alex Beregszaszi +* Max Heiber explains [How I Messed Up Our Repo and Ideas for Improving Git UX](https://medium.com/@maxheiber/how-i-messed-up-our-repo-and-ideas-for-improving-git-ux-e248d9e27e79#.hb10x5w10) +* [Demystifying Git internals](https://medium.com/@pawan_rawal/demystifying-git-internals-a004f0425a70#.l34w4zy60), by Pawan Rawal __Git tools and sites__ @@ -155,6 +161,10 @@ __Git tools and sites__ existing Gmane links using their Gmane id with URLs like `http://public-inbox.org/git/?q=gmane:123456`. * Josh Triplett [announced](https://public-inbox.org/git/20160729064055.GB25331@x/) a new git tool, [git-series](https://github.com/git-series/git-series/), to manage patch series with git, tracking the "history of history". git series tracks changes to the patch series over time, including rebases and other non-fast-forwarding changes. git series also tracks a cover letter for the patch series, formats the series for email, and prepares pull requests. This makes it easier to collaborate on a patch series, distribution package, backport, or any other development process that includes rebasing or non-fast-forward development. Josh plans to give a [presentation about git-series at LinuxCon North America](http://sched.co/7JVs). +* GitSense looks like an interesting service to provide [Git Analytics and Search](https://gitsense.com/insight?c=bitbucket:gitsense/contexts:gs_contexts::default.ccf) +* [git-confirm](https://github.com/pimterry/git-confirm) is a nice little Git hook to catch placeholders and temporary changes +* [git-time-metric](https://github.com/git-time-metric/gtm): Simple, seamless, lightweight time tracking for Git +* Resolve git conflicts within Atom using the package [merge-conflicts](https://atom.io/packages/merge-conflicts) ## Credits From e0e7013a42bc430c6fa36ae15b8eaee8ca988cbf Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 15 Aug 2016 22:30:46 +0200 Subject: [PATCH 0110/2664] rn-18: add Lars' interview --- rev_news/drafts/edition-18.md | 70 +++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index 2c02306bbf..a74c442406 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -130,6 +130,76 @@ but that he had no plan to port it to C and integrate it into Git. Junio also suggested a way to get a more human readable result for example by running `git show` on the merge commit. +## Developer Spotlight: Lars Schneider + +* Who are you and what do you do? + +I am a software engineer living in Berlin, Germany. Currently, I am the technical +lead for a team that helps 4000+ Autodesk engineers to adopt Git as their main +source control system. This is a challenging but also very interesting task as +I am constantly confronted with all kinds of problems that Git users run into. +Fortunately, Autodesk allows me to spend part of my time addressing these problems +and contribute possible solutions back to the community. + +* What would you name your most important contribution to Git? + +Autodesk has lots and lots of Perforce repositories with 20+ years of history. +We are gradually moving them to Git and during this process I try to constantly +improve the "git-p4" migration tool. I managed to get quite a number of patches +upstream already but there are still more in my local queue :-) + +However, I am most proud about an indirect contribution to Git. I helped the +Git community to setup Git CI builds for OSX and Linux on Travis CI. This makes +it really easy to ensure that new patches build without errors and cause no +test failures on all major platforms and compilers. Casual contributors can +create Pull Requests containing their patches against https://github.com/git/git +and 20min later they would know if their patches pass all checks. This way a +contributor can ensure that no precious reviewer time is wasted with broken +patches. + +* What are you doing on the Git project these days, and why? + +I am working on an improved Git filter protocol. Git filters are a great +mechanism to transparently modify repository content on commit and checkout. +Amongst other things it is used to adjust platform specific line endings, to +cleanup tab/whitespaces issues, to encrypt content, and to handle large files +outside of the Git repository (e.g. via +[git-annex](https://git-annex.branchable.com/) or +[Git LFS](https://git-lfs.github.com/)). + +The problem with the current protocol is that a filter process is invoked for +each individual file. If you have a large number of files, then you start an equally +large number of processes. This gets slow quickly and therefore I am working +on a patch series that reuses a single filter process for all files in the lifetime of a +Git process. + +* If you could get a team of expert developers to work full time on +something in Git for a full year, what would it be? + +First, we would improve the Travis CI setup and add Windows to the platforms +that are constantly tested. Afterwards we would join forces with David Turner, +Ben Peart, and Duy Nguyen and improve the Git performance for repositories +that contain a very large number of files. + +* If you could remove something from Git without worrying about +backwards compatibility, what would it be? + +I would not remove anything, but I would try to improve the UX. Unfortunately, +modifying the UX of Git core commands is incredible hard as these commands are +also used in a lot of scripts that we cannot break. + +* What is your favorite Git-related tool/library, outside of Git itself? + +A couple of years ago I wrote [ShowInGitHub](https://github.com/larsxschneider/ShowInGitHub), +a plugin that helps you to jump from a specific line of code in Xcode to the +same line on Github. It was my favorite Git tool during my iOS developer days. + +More recently I got really excited about [Git LFS](https://git-lfs.github.com/). +Granted, Git LFS breaks one of Git's core features as LFS repositories are by default +not distributed anymore. However, Git LFS is a pragmatic solution to a huge problem +that many Git users face if they need to store large media assets or integration test +data along with their source code. + ## Releases From 9b1528e8371a4bf513d2a0f0e10f32494dd91c71 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Mon, 15 Aug 2016 22:39:04 +0200 Subject: [PATCH 0111/2664] rn-18: add some helpers --- rev_news/drafts/edition-18.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index a74c442406..ba24db338a 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -240,4 +240,4 @@ existing Gmane links using their Gmane id with URLs like This edition of Git Rev News was curated by Christian Couder <>, Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from XXX. +with help from Lars Schneider, Johannes Schindelin, Roberto Tyley and Josh Triplett. From 93dcc24fc2434dd52885052f53ac825ee3d42c50 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 16 Aug 2016 11:40:42 +0200 Subject: [PATCH 0112/2664] rn-18: fix 'annoucement' typo --- rev_news/drafts/edition-18.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index ba24db338a..3618d73212 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -112,7 +112,7 @@ series, but is not a real patch, so is not applied - is by the way a different topic that [reappeared on the list recently](https://public-inbox.org/git/CA+P7+xpHDGY5RTR8ntrABdxqM6b4V9dndS68=kV1+1Ym1N6YKw@mail.gmail.com/) and was also discussed following the -[annoucement by Josh Triplett of his new git-series tool](https://public-inbox.org/git/20160729064055.GB25331@x/). +[announcement by Josh Triplett of his new git-series tool](https://public-inbox.org/git/20160729064055.GB25331@x/). To the main question about finding the topic branch containing a commit, Stefan Beller suggested using From 46fb6ad2ca61e1d45a8e58bd164b11beca0d93f9 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 16 Aug 2016 11:43:42 +0200 Subject: [PATCH 0113/2664] rn-18: add a link to 'git-annex' --- rev_news/drafts/edition-18.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index 3618d73212..8417657edd 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -212,7 +212,7 @@ data along with their source code. __Various__ * A ["Reedited" version](https://github.com/nobozo/progit2) of [*Pro Git 2nd Edition*](https://github.com/progit/progit2) by Jon Forrest -* Author of git-annex, Joey Hess has [launched a Patreon page to support continued development on his open source projects](https://www.patreon.com/joeyh) +* Author of [git-annex](https://git-annex.branchable.com/), Joey Hess has [launched a Patreon page to support continued development on his open source projects](https://www.patreon.com/joeyh) __Light reading__ From 0da804d18aab40ece6da1aa7c64fd6518470b87f Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Tue, 16 Aug 2016 11:51:54 +0200 Subject: [PATCH 0114/2664] rn-18: improve english grammar --- rev_news/drafts/edition-18.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index 8417657edd..e66a101aff 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -135,11 +135,11 @@ example by running `git show` on the merge commit. * Who are you and what do you do? I am a software engineer living in Berlin, Germany. Currently, I am the technical -lead for a team that helps 4000+ Autodesk engineers to adopt Git as their main +lead for a team that helps 4000+ Autodesk engineers adopt Git as their main source control system. This is a challenging but also very interesting task as I am constantly confronted with all kinds of problems that Git users run into. Fortunately, Autodesk allows me to spend part of my time addressing these problems -and contribute possible solutions back to the community. +and contributing possible solutions back to the community. * What would you name your most important contribution to Git? @@ -148,8 +148,8 @@ We are gradually moving them to Git and during this process I try to constantly improve the "git-p4" migration tool. I managed to get quite a number of patches upstream already but there are still more in my local queue :-) -However, I am most proud about an indirect contribution to Git. I helped the -Git community to setup Git CI builds for OSX and Linux on Travis CI. This makes +However, I am most proud of an indirect contribution to Git. I helped the +Git community set up Git CI builds for OSX and Linux on Travis CI. This makes it really easy to ensure that new patches build without errors and cause no test failures on all major platforms and compilers. Casual contributors can create Pull Requests containing their patches against https://github.com/git/git From b81e7ea0117372409216c192127169bc21668104 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Tue, 16 Aug 2016 12:10:10 +0200 Subject: [PATCH 0115/2664] rn-18: add Travis CI link --- rev_news/drafts/edition-18.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index e66a101aff..39aaf72278 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -149,7 +149,7 @@ improve the "git-p4" migration tool. I managed to get quite a number of patches upstream already but there are still more in my local queue :-) However, I am most proud of an indirect contribution to Git. I helped the -Git community set up Git CI builds for OSX and Linux on Travis CI. This makes +Git community set up Git [CI builds for OSX and Linux on Travis CI](https://travis-ci.org/git/git/branches). This makes it really easy to ensure that new patches build without errors and cause no test failures on all major platforms and compilers. Casual contributors can create Pull Requests containing their patches against https://github.com/git/git From 2ab181c515857efbe89862e5a8d44c96d205c307 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Tue, 16 Aug 2016 12:19:07 +0200 Subject: [PATCH 0116/2664] rn-18: minor corrections --- rev_news/drafts/edition-18.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index 8417657edd..0dd1a7b874 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -34,7 +34,7 @@ Only one filter process per Git command should be launched, and this process should communicate with the Git command using Lars' new filter protocol. -This would make Git faster when a large number of files has to +This would make Git faster when a large number of files have to be filtered and when the startup time of a filter process is not insignificant. @@ -48,13 +48,13 @@ On this pull request, Lars reports the following results when switching branches on OSX with 12,000 Git LFS files: ``` -Default Git: 6m2.979s + 0m1.310s = 364s -Git and Git LFS with stream filter support: 0m2.528s + 0m2.280s = 5s +Default Git and Git LFS: 6m2.979s + 0m1.310s = 364s +Git and Git LFS with filter protocol support: 0m2.528s + 0m2.280s = 5s ``` He says that with his filter protocol the operation is almost 70 times -faster and that he expect "even more dramatic results on Windows", as -launching a new process is usually slower on Windows. +faster in this particular use case and that he expects "even more dramatic +results on Windows", as launching a new process is usually slower on Windows. When he started working on this, Lars first sent emails to the mailing list to get information about From 709530e83f559d33ef90cdbe6be4f3016dcfb69e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 16 Aug 2016 16:36:51 +0200 Subject: [PATCH 0117/2664] rn-18: remove Nicola as he wishes --- rev_news/drafts/edition-18.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index 3149b74394..06dce4ce65 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -238,6 +238,6 @@ existing Gmane links using their Gmane id with URLs like ## Credits -This edition of Git Rev News was curated by Christian Couder <>, -Thomas Ferris Nicolaisen <> and Nicola Paolucci <>, -with help from Lars Schneider, Johannes Schindelin, Roberto Tyley and Josh Triplett. +This edition of Git Rev News was curated by Christian Couder <> and +Thomas Ferris Nicolaisen <>, with help from Lars Schneider, +Johannes Schindelin, Roberto Tyley and Josh Triplett. From 6fd94098c75641c3be77607ee54b44e389192798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Wed, 17 Aug 2016 02:22:57 +0200 Subject: [PATCH 0118/2664] Expand info about Gmane web interface shutting down Based on my replies to "Draft of Git Rev News edition 18" thread: Message-Id: <9f3b254f-451e-4f6d-233c-7e995d8e369e@gmail.com> Message-Id: <6b492c8c-2c75-9258-03dc-78346c98ff69@gmail.com> as requested by Christian Couder Message-Id: --- rev_news/drafts/edition-18.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index 06dce4ce65..a59dddf382 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -224,7 +224,7 @@ __Light reading__ __Git tools and sites__ * Gmane (a mailing list archive that was used heavily by some Git developers) -[shut down its web site](https://lars.ingebrigtsen.no/2016/07/28/the-end-of-gmane/comment-page-1/#comment-13502). +[shut down its web site](https://lars.ingebrigtsen.no/2016/07/28/the-end-of-gmane/comment-page-1/#comment-13502). This issue was covered in the ["Ingebrigtsen: The End of Gmane?"](https://lwn.net/Articles/695695/) short note on LWN.net, which got included in the ["Announcements" section of LWN.net Weekly Edition for August 4, 2016](http://lwn.net/Articles/695980/); comments there mention that threaded view in Gmane web interface had no equal in other mail archive sites. There is also [Alternatives to mid.gmane.org?](https://public-inbox.org/git/%3C481D1EE2-6A66-418F-AB28-95947BBF3680@gmail.com%3E/) thread, listing among others [MARC.info](https://marc.info/?l=git) and public-inbox. [A note from the maintainer](https://public-inbox.org/git/%3Cxmqq1t1twymf.fsf@gitster.mtv.corp.google.com%3E/) got updated in light of this change. * [public-inbox](https://public-inbox.org/), which is under heavy developement by Eric Wong, has [a git archive](https://public-inbox.org/git/) that is now used a lot instead of Gmane. [It allows](https://public-inbox.org/design_www.html) looking up From 698ed3b84185b2fe44ec62a87d80b6f6ebe61fa0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Wed, 17 Aug 2016 02:29:22 +0200 Subject: [PATCH 0119/2664] Add light reading (VC for gamedev) Link "Version control: Effective use, issues and thoughts, from a gamedev perspective" --- rev_news/drafts/edition-18.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index 06dce4ce65..641cf11efe 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -220,6 +220,7 @@ __Light reading__ * [Mango: Git completely decentralised](https://medium.com/@alexberegszaszi/mango-git-completely-decentralised-7aef8bcbcfe6) by Alex Beregszaszi * Max Heiber explains [How I Messed Up Our Repo and Ideas for Improving Git UX](https://medium.com/@maxheiber/how-i-messed-up-our-repo-and-ideas-for-improving-git-ux-e248d9e27e79#.hb10x5w10) * [Demystifying Git internals](https://medium.com/@pawan_rawal/demystifying-git-internals-a004f0425a70#.l34w4zy60), by Pawan Rawal +* [Version control: Effective use, issues and thoughts, from a gamedev perspective](http://www.what-could-possibly-go-wrong.com/version-control/), by Ashley Davis __Git tools and sites__ From 54b316ba83da60e33ce8211f2ada103fbf0cc4ca Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 17 Aug 2016 11:46:34 +0200 Subject: [PATCH 0120/2664] rn-18: add Jakub among the helpers --- rev_news/drafts/edition-18.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index de47a44762..8b1d735777 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -241,4 +241,4 @@ existing Gmane links using their Gmane id with URLs like This edition of Git Rev News was curated by Christian Couder <> and Thomas Ferris Nicolaisen <>, with help from Lars Schneider, -Johannes Schindelin, Roberto Tyley and Josh Triplett. +Johannes Schindelin, Roberto Tyley, Jakub Narębski and Josh Triplett. From 33b2cc0dc6a4210f057a2bebcb1548fa509510aa Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 17 Aug 2016 12:11:16 +0200 Subject: [PATCH 0121/2664] rn-18: add git-multimail 1.4.0 release --- rev_news/drafts/edition-18.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-18.md b/rev_news/drafts/edition-18.md index 8b1d735777..3e8311ae12 100644 --- a/rev_news/drafts/edition-18.md +++ b/rev_news/drafts/edition-18.md @@ -202,10 +202,10 @@ data along with their source code. ## Releases - * Jonas Fonseca [announced tig 2.2](https://public-inbox.org/git/CAFuPQ1%2Bi6BFRH%3D6HUWzDgM7J%2BhL_3hUNv5-4mjjGm%3Dh-YWVuzg%40mail.gmail.com/), see also the [release page](https://github.com/jonas/tig/releases/tag/tig-2.2) * [GitLab 8.10](https://about.gitlab.com/2016/07/22/gitlab-8-10-released/) through [8.10.3](https://about.gitlab.com/2016/08/01/gitlab-8-dot-10-dot-3-released/) * [GitHub Enterprise 2.7](https://github.com/blog/2214-github-enterprise-2-7-is-now-available-with-enhanced-security-and-more-powerful-apis) +* Matthieu Moy [announced git-multimail 1.4.0](http://public-inbox.org/git/20160817064116.18399-1-Matthieu.Moy@imag.fr/) ## Other News From b27d5f1ae155e1ba8755fd53b716aae09e727ac7 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 17 Aug 2016 12:21:21 +0200 Subject: [PATCH 0122/2664] Publish rn-18 in _posts/ --- .../drafts/edition-18.md => _posts/2016-08-17-edition-18.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-18.md => _posts/2016-08-17-edition-18.markdown (100%) diff --git a/rev_news/drafts/edition-18.md b/_posts/2016-08-17-edition-18.markdown similarity index 100% rename from rev_news/drafts/edition-18.md rename to _posts/2016-08-17-edition-18.markdown From 58facbd3edade7b158878b432d613a7ec67e1df8 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 17 Aug 2016 12:30:01 +0200 Subject: [PATCH 0123/2664] Add draft for rn-19 --- rev_news/drafts/edition-19.md | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 rev_news/drafts/edition-19.md diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md new file mode 100644 index 0000000000..fbbea28aa1 --- /dev/null +++ b/rev_news/drafts/edition-19.md @@ -0,0 +1,49 @@ +--- +title: Git Rev News Edition 19 (XXX, 2016) +layout: default +date: 2016-09-17 12:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 19 (XXX, 2016) + +Welcome to the 19th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). + +This edition covers what happened during the month of August 2016. + +## Discussions + + + + + + + +## Releases + + +## Other News + +__Various__ + + +__Light reading__ + + +__Git tools and sites__ + + +## Credits + +This edition of Git Rev News was curated by Christian Couder <> and +Thomas Ferris Nicolaisen <>, with help from XXX. From 224b908621932ca43127838f8e34e6ca1b653364 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 17 Aug 2016 15:30:58 +0200 Subject: [PATCH 0124/2664] rn-18: add the Git releases --- _posts/2016-08-17-edition-18.markdown | 3 +++ 1 file changed, 3 insertions(+) diff --git a/_posts/2016-08-17-edition-18.markdown b/_posts/2016-08-17-edition-18.markdown index 3e8311ae12..e94d62d6d3 100644 --- a/_posts/2016-08-17-edition-18.markdown +++ b/_posts/2016-08-17-edition-18.markdown @@ -202,6 +202,9 @@ data along with their source code. ## Releases +* [Git 2.10.0-rc0](https://public-inbox.org/git/xmqqfuq7j7cw.fsf@gitster.mtv.corp.google.com/) +* [Git 2.9.3](https://public-inbox.org/git/xmqq37m9wymv.fsf@gitster.mtv.corp.google.com/) +* [Git for Windows 2.9.3](https://public-inbox.org/git/alpine.DEB.2.20.1608131214070.4924@virtualbox/) * Jonas Fonseca [announced tig 2.2](https://public-inbox.org/git/CAFuPQ1%2Bi6BFRH%3D6HUWzDgM7J%2BhL_3hUNv5-4mjjGm%3Dh-YWVuzg%40mail.gmail.com/), see also the [release page](https://github.com/jonas/tig/releases/tag/tig-2.2) * [GitLab 8.10](https://about.gitlab.com/2016/07/22/gitlab-8-10-released/) through [8.10.3](https://about.gitlab.com/2016/08/01/gitlab-8-dot-10-dot-3-released/) * [GitHub Enterprise 2.7](https://github.com/blog/2214-github-enterprise-2-7-is-now-available-with-enhanced-security-and-more-powerful-apis) From 6327c72477bbfcff1e630379d6da4e4b6982d474 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 17 Aug 2016 15:36:52 +0200 Subject: [PATCH 0125/2664] rn-18: link to discussion about Progit reedited --- _posts/2016-08-17-edition-18.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2016-08-17-edition-18.markdown b/_posts/2016-08-17-edition-18.markdown index e94d62d6d3..06f60601eb 100644 --- a/_posts/2016-08-17-edition-18.markdown +++ b/_posts/2016-08-17-edition-18.markdown @@ -214,7 +214,7 @@ data along with their source code. __Various__ -* A ["Reedited" version](https://github.com/nobozo/progit2) of [*Pro Git 2nd Edition*](https://github.com/progit/progit2) by Jon Forrest +* A ["Reedited" version](https://github.com/nobozo/progit2) of [*Pro Git 2nd Edition*](https://github.com/progit/progit2) by Jon Forrest (announcement and discussion on why reedited [here](https://public-inbox.org/git/nn1euf$h6q$1@ger.gmane.org/)) * Author of [git-annex](https://git-annex.branchable.com/), Joey Hess has [launched a Patreon page to support continued development on his open source projects](https://www.patreon.com/joeyh) __Light reading__ From 86d9bb5642850fd6d4a52d634ea72696e84d847e Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 17 Aug 2016 15:48:18 +0200 Subject: [PATCH 0126/2664] rn-18: use GfW release page url The GitHub release page is somewhat prettier. Besides, public-inbox does not display text attachments inline. --- _posts/2016-08-17-edition-18.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2016-08-17-edition-18.markdown b/_posts/2016-08-17-edition-18.markdown index 06f60601eb..c8a0652048 100644 --- a/_posts/2016-08-17-edition-18.markdown +++ b/_posts/2016-08-17-edition-18.markdown @@ -204,7 +204,7 @@ data along with their source code. * [Git 2.10.0-rc0](https://public-inbox.org/git/xmqqfuq7j7cw.fsf@gitster.mtv.corp.google.com/) * [Git 2.9.3](https://public-inbox.org/git/xmqq37m9wymv.fsf@gitster.mtv.corp.google.com/) -* [Git for Windows 2.9.3](https://public-inbox.org/git/alpine.DEB.2.20.1608131214070.4924@virtualbox/) +* [Git for Windows 2.9.3](https://github.com/git-for-windows/git/releases/tag/v2.9.3.windows.1) * Jonas Fonseca [announced tig 2.2](https://public-inbox.org/git/CAFuPQ1%2Bi6BFRH%3D6HUWzDgM7J%2BhL_3hUNv5-4mjjGm%3Dh-YWVuzg%40mail.gmail.com/), see also the [release page](https://github.com/jonas/tig/releases/tag/tig-2.2) * [GitLab 8.10](https://about.gitlab.com/2016/07/22/gitlab-8-10-released/) through [8.10.3](https://about.gitlab.com/2016/08/01/gitlab-8-dot-10-dot-3-released/) * [GitHub Enterprise 2.7](https://github.com/blog/2214-github-enterprise-2-7-is-now-available-with-enhanced-security-and-more-powerful-apis) From 860469e1116aef3faefdfed90280981b563e2277 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 10 Sep 2016 08:24:44 +0200 Subject: [PATCH 0127/2664] rn-19: set publication date to September 14th --- rev_news/drafts/edition-19.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index fbbea28aa1..3a7208663d 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -1,13 +1,13 @@ --- -title: Git Rev News Edition 19 (XXX, 2016) +title: Git Rev News Edition 19 (September 14th, 2016) layout: default -date: 2016-09-17 12:06:51 +0100 +date: 2016-09-14 12:06:51 +0100 author: chriscool categories: [news] navbar: false --- -## Git Rev News: Edition 19 (XXX, 2016) +## Git Rev News: Edition 19 (September 14th, 2016) Welcome to the 19th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to From 2781bad02ee6c88adcb7f59c4d9742a57bffdacb Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 10 Sep 2016 10:21:35 +0200 Subject: [PATCH 0128/2664] rn-19: add article about git-series --- rev_news/drafts/edition-19.md | 221 +++++++++++++++++++++++++++++++++- 1 file changed, 219 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index 3a7208663d..8e12bf60eb 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -17,9 +17,226 @@ This edition covers what happened during the month of August 2016. ## Discussions - + +* [git-series presentation at the LinuxCon North America](https://www.youtube.com/watch?v=68XsuXlWiWU&index=23&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8) + +There were a significant number of Git related presentations at the +[LinuxCon North America 2016 in Toronto](http://events.linuxfoundation.org/events/linuxcon-north-america) +from August 22 to August 24, and they happened to be recorded: + + - [Who Authored the Kernel? Recovering Token-Level Authorship Information from Git by Daniel German](https://www.youtube.com/watch?v=iXZV5uAYMJI&index=4&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8), see also the [LWN article](http://lwn.net/Articles/698425/). + - [Versions All the Way Down: Versioning Commits and Patches with Git-Series by Josh Triplett, Intel](https://www.youtube.com/watch?v=68XsuXlWiWU&index=23&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8). + - [Tracking Huge Files with Git LFS by Tim Pettersen, Atlassian](https://www.youtube.com/watch?v=yuKAV5cCcTw&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8&index=24). + - [Terrible Ideas in Git by Corey Quinn, FutureAdvisor](https://www.youtube.com/watch?v=Wr7ulql0Exo&index=25&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8). + - [Git and Testing by your own Christian Couder](https://www.youtube.com/watch?v=TcgyVWBg8EQ&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8&index=26) + +One of the most attended was Josh's presentation +([slides](http://events.linuxfoundation.org/sites/events/files/slides/git-series.pdf), +[video](https://www.youtube.com/watch?v=68XsuXlWiWU&index=23&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8)) +about git-series. Josh had already +[announced git-series on the mailing list](https://public-inbox.org/git/20160729064055.GB25331@x/) +which had generated some amount of dicussion about how the different +efforts to store more data and metadata related to patch series using +git itself could collaborate. + +In his talk Josh started by explaining the problems with the current +way of handling a patch series. + +One problem is that when you get feedback, you have to rework your +patch series, so you create another version of your patch series. But +then what happens to the previous version of the series? + +You have to keep it, because people can tell you that they liked +better what your previous version did, and because some people are +actually interested in the real history of your code. + +You could use the reflog to keep it, but it is effemeral by default +and it is not easy to push or pull. You could also dig an email from +your sent-mail folder or a mailing list archive. + +So a fundamental problem is that Git tracks only curated history +but we need more than that, we need the history of history. + +`git submodule` could be used to track that but people generally have +a bad experience with `git submodule`. It's also possible to manage +patches outside Git. There are tools like for example quilt that can +be used for this purpose, but then you loose the power of working with +Git. + +Another possibility is to use branches with version names like +feature-v1, feature-v2 and so on. But soon you could have names like +feature-v8-rebased-on-3-4-alice-fix and then "everybody who worked in +a corporate environment would feel right at home". + +Such solutions anyway don't solve the problem of managing the cover +letter and the base commit which is the commit you started your patch +series from. + +They also don't solve the problem of collaboration. One rule of +collaboration is to never rewrite published history, but then how do +you collaborate on history that needs rewritting? + +Emailing patches back and forth is not a good solution for some kinds +of work like backporting a feature, preparing a distribution package, +rebasing stacks of patches sitting on top of upstream code. + +'git-series' has been developed to fix all those problems. It tracks +the history of a patch series, and also tracks its cover letter and its +base. + +Then josh gave a demo. + +To create a series called "feature" based on v4.7, you would run for +example: + +``` +git series start feature +-> HEAD is now detached at fa8410b Linux 4.8-rc3 +git checkout v4.7 +-> HEAD is now at 523d939... Linux 4.7 +git series base v4.7 +-> Set patch series base to 523d939 Linux 4.7 +vim README +git commit -a -m 'Change A' +vim README +git commit -a -m 'Change B' +git series status +-> On series feature +-> +-> Initial series commit +-> Changes not staged for commit: +-> (use "git series add ..." to update what will be commited) +-> +-> Added: base +-> Added: base +-> +-> no changes added to commit (use "git series add" or "git series commit -a") +git series add series +git series add base +git series commit +-> [feature 5eca363] Initial version of feature +git series cover +-> Updated cover letter +git series commit -a -m "Add cover letter" +``` + +The following commands were also part of Josh's demo: + + - `git series log` + - `git series rebase -i` + - `git series rebase v4.8-rc3` + - `git series format` # to format patches like `git format-patch` + - `git series req ~/remote-location/linux feature` # to send a pull request like `git request-pull` + - `git series checkout another-feature` # to work on another patch series + +Then Josh went back to the presentation to talk about how git-series +works. + +The internals are described in INTERNALS.md in the git-series repo. + +After reviewing the Git objects (blobs, trees, commits, tags) and +refs, Josh noticed that trees can refer to commits and such an entry +in a tree is called a "gitlink". Gitlinks are already used by git +submodule. git-series uses them to track the series and the base. + +One of the requirements for git-series was that every object +referenced by git-series has to be reachable by Git, otherwise it +might get deleted, and you want to be able to push and pull the +objects, but you can do this only if they are reachable. + +The way git-series is implemented is that a series is like a branch +prefixed with 'git-series', for example: + + refs/heads/git-series/feature + +This branch points to a commit for example called series-v2, that +itself has commit series-v1 as its first parent. + +The tree pointed to by these commit has the following entries: + + - series: a gitlink pointing to the top commit of the series + - base: a gitlink pointing to the base commit of the series + - cover: a blob containing the cover letter + +The problem with this is that Git by default doesn't follow gitlinks +for reachability or push/pulls. + +To fix that, an extra parent commit is added to the series-v1 and +series-v2 commits for reachability. git-series ignore that parent when +traversing the commits. + +Josh then gave more "minor details" about how it works. + +Your current branch is refered by HEAD and the current series is +refered by refs/SHEAD, in which 'refs/' is needed for reachability. + +The working and staged states are respectively in: + + - refs/git-series-internals/working/feature + - refs/git-series-internals/staged/feature + +which both points to temporary commits. This is needed for +reachability of a not yet commited cover letter. + +Then Josh talked about his experience designing and developing +git-series. + +He found on multiple occasions that avoiding to need big errors +messages was a good strategy. Often a long and complex error messages +suggested he migth have a design flaw, so he redesigned to make the +error impossible. + +One example of that is what happens when we detach from a series or +check out a new series with uncommited changes. First he had designed +git-series to use only one staged and working version for a +repository, so in this case he would have needed an error message to +explain that you could loose some data and perhaps something like +`git series checkout --force` to checkout anyway. + +Then he realized that if each series had its own working and staged +version there would be no need for such an error message and for a +force option. + +Another example is what happens when you have created a new series and +made some change to it, but have not yet commited anything, and you +want to detach from it or checkout a new series. + +Git has the notion of an "unborn branch", as, when you create a repo, +the "master" is created and HEAD points to it, but "master" doesn't +point to anything. This means many special cases. + +Instead of having to write error messages when we detach from a series +or when we checkout another one, as soon as you start a series the +working and staged versions are created and a message says: "new no +commit yet". So unlike git you can create new series with nothing on +them yet. + +Josh then explained that `git series rebase` was interesting to +implement because libgit2, which was used to implement git-series, has +no support for rebase. + +Git saves state when it fails in the middle of a rebase and you have +to use `git rebase --continue` to continue when the problem has been +fixed. + +So a temporary measure Josh used, while working on implementing rebase +in libgit2, is to write out all the necessary state that Git would +save if it failed, and then exec `git rebase --continue`. This way Git +resumes a rebase that it never started. + +The last things Josh talked about are the tools he used to build +git-series. Josh used Rust and libgit2 with its Rust bindings. He +highly recommends libgit2 and Rust. He said libgit2 was essential and +is really effective to play with a repository. + +git-series has been the project he used to learn how to use Rust. As +it is still a very young language, he had to submit patches to the +libgit2 Rust bindings and to a few other Rust libraries to make them +do what he needed. + +It was really fun experience especially because he didn't have to deal +with memory management. + +* [Use header data patch ids for rebase to avoid loading file content](http://public-inbox.org/git/20160729161920.3792-1-kcwillford@gmail.com/) + +One of the improvements in the just released Git v2.10 is an +optimization of the patch id mechanism implemented by Kevin Willford +helped by Johannes Schindelin, alias Dscho, as Kevin and Dscho are +colleagues working for Microsoft. + +The patch id mechanism is used for example by `git rebase` to avoid +trying to rebase commits that have been already integrated. This is +done by computing a finger print of each commit called "patch id" and +comparing the patch ids of the commits on the two sides of the rebase. + +Kevin started by sending +[a patch called "Use path comparison for patch ids before the file content"](https://public-inbox.org/git/20160714201758.13180-1-kcwillford@gmail.com/). + +The idea behind his patch is that, to compare commits, it should be +simpler to first look which files are changed by the commits, before +looking at their content. If the files changed by two commits are +different, there is no need to look at what is changed exactly to tell +that the commits are different. + +So instead of computing a patch id made from the content of a commit, +it is more efficient to compute a patch id based on the files that are +changed and only if necessary compute another patch id based on the +content that is changed. This makes `git rebase` 1% to 6% faster. + +Junio Hamano agreed that it was a good idea and suggested some +improvements. Dscho also commented and suggested other improvements +including to split the patch. + +A few weeks later Kevin sent +[a version 2](http://public-inbox.org/git/20160729161920.3792-1-kcwillford@gmail.com/) +in the form of a 4 patch series. + +There were some discussions around a few related issues but in the end +the patch series got merged. +## Developer Spotlight: Brian M. Carlson + +* Who are you and what do you do? + +I'm a software developer living in Houston, Texas, US. I've long been +involved in the FLOSS community, mostly with one-off patches, +documentation improvements, and other maintenance-related work. I'm a +polyglot programmer, and I contribute to Asciidoctor, among other +projects. I also enjoy biking and writing in my spare time. + +Professionally, I'm a developer with cPanel. There I do maintenance +work on our product and development tools, manage alternating releases, +advise on security design, and of course maintain the copy of Git we use +internally and ship to customers. I also perform some training for +developers, QA, and documentation folk on how to use Git and how to use +it more effectively. + +* What would you name your most important contribution to Git? + +One of the things I've really enjoyed doing is making Git work better +over HTTP with Kerberos. I use Kerberos for my internal network +infrastructure at home, and Git has gone from not working at all to +being very robust and reliable using Kerberos authentication. There are +still some usability issues we can improve on, though. + +* What are you doing on the Git project these days, and why? + +Most of my time is spent on converting the code to use a structure for +object identifiers (hashes) instead of one-off arrays everywhere. This +improves the quality and maintainability of the code, and it also makes +it easier to switch to a different hash than SHA-1. Depending on the +hash that's chosen, we could also potentially improve the performance of +Git as a result of that work as well. + +* If you could get a team of expert developers to work full time on + something in Git for a full year, what would it be? + +One thing I know is a pain point for a lot of people is very large +repositories, whether that's in terms of number or size of files, total +repository size, or number of references. I've personally had to +troubleshoot some of those problems, and I'd love to get some additional +improvements in that area to make Git perform better and use less space. + +* If you could remove something from Git without worrying about + backwards compatibility, what would it be? + +I think I'd remove the dumb HTTP and FTP support. It tends to perform +really badly, requires per-repository server-side configuration to get +right, and complicates the smart HTTP protocol code. + +* What is your favorite Git-related tool/library, outside of Git itself? + +To be honest, it's zsh's built-in vcs_info functionality. It +automatically detects what branch I'm on, if I'm in the middle of an +operation like a rebase or cherry-pick, and whether changes are staged +or not, as well as providing pretty good completion. It works with a +wide variety of Git versions and of course has the scope of features +you'd expect from zsh. + + ## Releases @@ -301,4 +361,4 @@ __Git tools and sites__ ## Credits This edition of Git Rev News was curated by Christian Couder <> and -Thomas Ferris Nicolaisen <>, with help from XXX. +Thomas Ferris Nicolaisen <>, with help from Brian M. Carlson. From b1d5d7c74e7077fae80f2e8b0748d76ad367d927 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 11 Sep 2016 22:00:29 +0200 Subject: [PATCH 0133/2664] rn-19: fix typo in git-series article --- rev_news/drafts/edition-19.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index f157f4799e..683af6d873 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -51,7 +51,7 @@ You have to keep it, because people can tell you that they liked better what your previous version did, and because some people are actually interested in the real history of your code. -You could use the reflog to keep it, but it is effemeral by default +You could use the reflog to keep it, but it is ephemeral by default and it is not easy to push or pull. You could also dig an email from your sent-mail folder or a mailing list archive. @@ -61,7 +61,7 @@ but we need more than that, we need the history of history. `git submodule` could be used to track that but people generally have a bad experience with `git submodule`. It's also possible to manage patches outside Git. There are tools like for example quilt that can -be used for this purpose, but then you loose the power of working with +be used for this purpose, but then you lose the power of working with Git. Another possibility is to use branches with version names like @@ -85,7 +85,7 @@ rebasing stacks of patches sitting on top of upstream code. the history of a patch series, and also tracks its cover letter and its base. -Then josh gave a demo. +Then Josh gave a demo. To create a series called "feature" based on v4.7, you would run for example: @@ -184,14 +184,14 @@ git-series. He found on multiple occasions that avoiding to need big errors messages was a good strategy. Often a long and complex error messages -suggested he migth have a design flaw, so he redesigned to make the +suggested he might have a design flaw, so he redesigned to make the error impossible. One example of that is what happens when we detach from a series or check out a new series with uncommited changes. First he had designed git-series to use only one staged and working version for a repository, so in this case he would have needed an error message to -explain that you could loose some data and perhaps something like +explain that you could lose some data and perhaps something like `git series checkout --force` to checkout anyway. Then he realized that if each series had its own working and staged @@ -361,4 +361,4 @@ __Git tools and sites__ ## Credits This edition of Git Rev News was curated by Christian Couder <> and -Thomas Ferris Nicolaisen <>, with help from Brian M. Carlson. +Thomas Ferris Nicolaisen <>, with help from Brian M. Carlson and Josh Triplett. From 106a9633549cd51aead7fad90a84354b4c76217a Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 11 Sep 2016 23:18:21 +0200 Subject: [PATCH 0134/2664] rn-19: add GSoC wrap up --- rev_news/drafts/edition-19.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index 683af6d873..20440882ff 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -241,6 +241,24 @@ North America it will happen in Los Angeles, September 11-13. Perhaps the name change hints that it could become an even more relevant place for Git related presentations. +* [Google Summer of Code 2016](https://summerofcode.withgoogle.com/) Wrap Up + +There was only one student, [Pranit Bauva](https://github.com/pranitbauva1997/), +mentored by Lars Schneider and Christian Couder, who participated this +year in the Google Summer of Code. Matthieu Moy and Jeff King were the +GSoC administrators for the Git project. + +Pranit has been working on an "Incremental rewrite of git-bisect" +which goal was to port parts of the `git bisect` command from shell to +C code. + +Pranit wrote +[a report about his work](https://docs.google.com/document/d/1Uir0a8cRYlWANuzoU4iTDtEvPukvtTJcC_dB3KJUgqM/edit#heading=h.mipx2w79za4f) +and uploaded +[the last version of the patches he wrote before the end of the GSoC](https://drive.google.com/drive/folders/0B2SBIDYEkAaiV2xhNWZNSUdWOVE). + +Pranit passed the GSoC final evaluation. + ### Reviews * [Use header data patch ids for rebase to avoid loading file content](http://public-inbox.org/git/20160729161920.3792-1-kcwillford@gmail.com/) From 3489086164b605888539ba17bb42bd035629ed6a Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 13 Sep 2016 21:58:23 +0200 Subject: [PATCH 0135/2664] rn-19: thank you Nicola and call for help --- rev_news/drafts/edition-19.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index 20440882ff..894f2d353c 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -259,6 +259,26 @@ and uploaded Pranit passed the GSoC final evaluation. +* Thank you Nicola and call for help! + +From the beginning in March 2015, Nicola Paolucci helped set up the +infrastructure for Git Rev News, especially MailChimp to send Git Rev +News as an email to people who subscribed to receive it this way, and +a number of miscellaneous improvements. + +Unfortunately, as he has been lacking bandwidth to work on Git Rev +News recently, he asked to be de-installed from being an editor. So we +are now only two, while there is more and more to do to have a +relevant, vibrant and entertaining news letter for the Git Community. + +That's why we are thanking Nicola for his help, and looking for other +people to join our small Git Rev News editor team. + +There is no need to even know Git well for that. It's possible to +participate by just proofreading articles for example. Please contact +us (see our emails at the bottom) if you are interested. + + ### Reviews * [Use header data patch ids for rebase to avoid loading file content](http://public-inbox.org/git/20160729161920.3792-1-kcwillford@gmail.com/) From def86cb7d5f98b95388c960047417570cca19cb7 Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Tue, 13 Sep 2016 22:16:28 +0100 Subject: [PATCH 0136/2664] add Git CI stats link --- rev_news/drafts/edition-19.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index 894f2d353c..2df33eb139 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -394,6 +394,7 @@ __Light reading__ __Git tools and sites__ +* [Git CI stats](https://larsxschneider.github.io/git-ci-stats/) - List all commits of a given branch and visualize the CI status, CI execution time, and failing test ## Credits From a1e46029554b7144dbdb976c1675b95bcda17483 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 14 Sep 2016 00:13:00 +0200 Subject: [PATCH 0137/2664] rn-19: add links and releases --- rev_news/drafts/edition-19.md | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index 2df33eb139..11791f75db 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -384,20 +384,39 @@ you'd expect from zsh. ## Releases +* [Git 2.10](https://public-inbox.org/git/xmqqtwdxsp5q.fsf@gitster.mtv.corp.google.com/) +* [Git 2.10 overview from Peff@GitHub](https://github.com/blog/2242-git-2-10-has-been-released) +* [Git for Windows 2.10](https://github.com/git-for-windows/git/releases/tag/v2.10.0.windows.1) +* [Git for Windows 2.10 overview from Dscho@Microsoft](https://blogs.msdn.microsoft.com/visualstudioalm/2016/09/03/whats-new-in-git-for-windows-2-10/) +* [libgit2/rugged v0.25.0b8](https://github.com/libgit2/rugged/releases/tag/v0.25.0b8) +* [GitLab 8.11](https://about.gitlab.com/2016/08/22/gitlab-8-11-released/) through [8.11.5 ](https://about.gitlab.com/2016/09/07/gitlab-8-dot-11-dot-5-released/) +* GUI tool [GitKraken v1.6](https://blog.axosoft.com/2016/09/12/gitkraken-v1-6/) ## Other News -__Various__ +* GitLab elaborates on their new round of founding in the [GitLab Master Plan](https://about.gitlab.com/2016/09/13/gitlab-master-plan/) +* [Gmane has a new maintainer](http://lwn.net/Articles/699704/), which is good because we have a lot of old links pointing to Gmane in previous editions. +__Git tips and tricks__ +* [Oh, shit, git!](http://ohshitgit.com/) by Katie Sylor-Miller +* [Git Hot Tips](http://wesbos.com/git-hot-tips/) by Wes Bos +* [Git diff tips and tricks](https://blog.twobucks.co/git-diff-tips-and-tricks/) by Hrvoje Šimić -__Light reading__ +__Light reading__ +* [Git - Basic hygiene of working with repository](http://www.allinmobile.co/git-basic-hygiene-of-working-with-repository/) by Luke Konior __Git tools and sites__ -* [Git CI stats](https://larsxschneider.github.io/git-ci-stats/) - List all commits of a given branch and visualize the CI status, CI execution time, and failing test - +* [Git CI stats](https://larsxschneider.github.io/git-ci-stats/) - List all commits of a given branch and visualize the CI status, CI execution time, and failing test +* [git-fiddle: Edit commit messages, authors and timestamps during git-rebase](https://github.com/felixSchl/git-fiddle) +* [SparkleShare - Self hosted, instant, secure file sync](https://www.sparkleshare.org/) based on Git +* [git-clean: A Command Line Tool written in Rust for cleaning up local and remote Git branches](https://github.com/mcasper/git-clean) +* [Fork - a fast and friendly git client for Mac](https://git-fork.com/) +* [GitHeat](http://www.mustafa-s.com/Githeat/) - Interactive heatmaps for your git repositories +* [Git Undo](http://megakemp.com/2016/08/25/git-undo/) is a neat little alias for getting stuff out of the reflog +* [literate-git: Render hierarchical git repositories into HTML](https://github.com/bennorth/literate-git/) - see a demo of it [here](http://www.redfrontdoor.org/20160813-literate-git-demo/index.html) ## Credits This edition of Git Rev News was curated by Christian Couder <> and -Thomas Ferris Nicolaisen <>, with help from Brian M. Carlson and Josh Triplett. +Thomas Ferris Nicolaisen <>, with help from Brian M. Carlson, Jakub Narębski and Josh Triplett. From 200459093c47863f27ed363c09abcc900bb97e02 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 14 Sep 2016 00:15:24 +0200 Subject: [PATCH 0138/2664] rn-19: add some linebreaks for jekyll Headings and lists got messed up without these extra breaks. --- rev_news/drafts/edition-19.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index 11791f75db..91082e3f7e 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -398,15 +398,18 @@ you'd expect from zsh. * [Gmane has a new maintainer](http://lwn.net/Articles/699704/), which is good because we have a lot of old links pointing to Gmane in previous editions. __Git tips and tricks__ + * [Oh, shit, git!](http://ohshitgit.com/) by Katie Sylor-Miller * [Git Hot Tips](http://wesbos.com/git-hot-tips/) by Wes Bos * [Git diff tips and tricks](https://blog.twobucks.co/git-diff-tips-and-tricks/) by Hrvoje Šimić __Light reading__ + * [Git - Basic hygiene of working with repository](http://www.allinmobile.co/git-basic-hygiene-of-working-with-repository/) by Luke Konior __Git tools and sites__ + * [Git CI stats](https://larsxschneider.github.io/git-ci-stats/) - List all commits of a given branch and visualize the CI status, CI execution time, and failing test * [git-fiddle: Edit commit messages, authors and timestamps during git-rebase](https://github.com/felixSchl/git-fiddle) * [SparkleShare - Self hosted, instant, secure file sync](https://www.sparkleshare.org/) based on Git From ae9648e0a094c91cf79b566512dc4a1f1b599160 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 14 Sep 2016 00:19:48 +0200 Subject: [PATCH 0139/2664] rn-19: add link to Git users' survey --- rev_news/drafts/edition-19.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index 91082e3f7e..d8f55ce1ad 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -394,6 +394,7 @@ you'd expect from zsh. ## Other News +* [Git User's Survey 2016](https://survs.com/survey/3cop1kt5eg) is out! * GitLab elaborates on their new round of founding in the [GitLab Master Plan](https://about.gitlab.com/2016/09/13/gitlab-master-plan/) * [Gmane has a new maintainer](http://lwn.net/Articles/699704/), which is good because we have a lot of old links pointing to Gmane in previous editions. From 5aa40d86ec4d06f69202f36584b071e19fb75004 Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 14 Sep 2016 00:20:08 +0200 Subject: [PATCH 0140/2664] jekyll: state gemfile group Becauase it says so in the GH pages documentation. --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index de3ef7f8e7..a7bf33a1b8 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ source 'https://rubygems.org' # Because https://help.github.com/articles/using-jekyll-with-pages/ -gem 'github-pages' +gem 'github-pages', group: :jekyll_plugins From efdf2b325728df44a6ff79b2ac48af343e0f7e3b Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Wed, 14 Sep 2016 01:33:00 +0200 Subject: [PATCH 0141/2664] Git User's Survey 2016 Add announcement about Git User's Survey 2016 (with links), with a bit of information about the history of this survey, and Git user's survey in general. In "Discussions" / "General". Link from "Other news" got removed. --- rev_news/drafts/edition-19.md | 55 +++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index d8f55ce1ad..71a1f7c367 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -259,6 +259,59 @@ and uploaded Pranit passed the GSoC final evaluation. +* **[Git User's Survey 2016](https://survs.com/survey/3cop1kt5eg)** is open till **20 October 2016** + +This year we will see the return of Git User's Survey (the last one was +in 2012). The goal of the survey is mainly to help to understand who is +using Git, how and why. + +The results will be published to the Git wiki on the +[GitSurvey2016](https://git.wiki.kernel.org/index.php/GitSurvey2016) +page and discussed on the git mailing list. + +The survey would be open from **12 September** to **20 October 2016**. + +Beside getting information on how people use Git, what are their pain +points, and what they want from Git (which might be different from what +Git developers think it is), the [survey has also educational purpose, +and includes a bit of advertisement](https://public-inbox.org/git/577E6F32.7020007%40gmail.com/) +(brief note about this +was in [#17](https://git.github.io/rev_news/2016/07/20/edition-17/)). +For example question about tools used or one about features used teaches +what is available (and which might had been not known). + +The questions were prepared with the help of Eric Wong and Andrew Adrill; +the [[RFC] Proposed questions for "Git User's Survey 2016"](http://public-inbox.org/git/91a2ffbe-a73b-fbb9-96da-9aea4d439e5a@gmail.com/t/) +thread and its subthreads was posted to solicite feedback. + +The survey was announced first on Git mailing list in +[[ANNOUNCE] Git User's Survey 2016](http://public-inbox.org/git/de39c03d-e84e-8e45-69cb-a2e01fd25df2@gmail.com/) thread. +At request to survey administrator, Jakub Narębski, (as response to the +announcement email), one can get a separate channel in survey, with +a separate survey URL, so that responses from a particular site +or an organization could be split out. Some companies already +got their customized survey URLs. + +It should be noted that the result of the survey need to be taken with +a bit of caution. As Johannes Schindelin [reminded us](http://public-inbox.org/git/alpine.DEB.2.20.1609091503410.129229@virtualbox/), +many professional developers that use Git would be too busy to take the +survey. Though hopefully the fact that you can fill it bit by bit +(from the same computer), instead of having to fill it whole at once, +would help. Taking 30 minutes or more at once may be a problem, +taking 10 times a 3 minutes at once may not be... + +There is also alternate version of the survey (alternate channel), +which does not require cookies or JavaScript, and is fully anonymous, +but it doesn't allow one to go back to response and edit it: +https://tinyurl.com/GitSurvey2016-anon + +***A bit of history:*** First "GIT user survey" was [announced](http://public-inbox.org/git/4d8e3fd30606240918m6b452314m6514b5e5fc86f147@mail.gmail.com/) +and created in 2006; its results can be found at [GitSurvey2006](https://git.wiki.kernel.org/index.php/GitSurvey2006) +page on Git Wiki. So this year's survey is 10th anniversary +of the first one. Since 2008 the Git User's Survey was hosted on +[Survs.com](https://survs.com) (then beta), thanks to generocity +of the site, who provides with recurring premium annual plan. + * Thank you Nicola and call for help! From the beginning in March 2015, Nicola Paolucci helped set up the @@ -278,7 +331,6 @@ There is no need to even know Git well for that. It's possible to participate by just proofreading articles for example. Please contact us (see our emails at the bottom) if you are interested. - ### Reviews * [Use header data patch ids for rebase to avoid loading file content](http://public-inbox.org/git/20160729161920.3792-1-kcwillford@gmail.com/) @@ -394,7 +446,6 @@ you'd expect from zsh. ## Other News -* [Git User's Survey 2016](https://survs.com/survey/3cop1kt5eg) is out! * GitLab elaborates on their new round of founding in the [GitLab Master Plan](https://about.gitlab.com/2016/09/13/gitlab-master-plan/) * [Gmane has a new maintainer](http://lwn.net/Articles/699704/), which is good because we have a lot of old links pointing to Gmane in previous editions. From 4be063e873369dc26347e4a9e25127511f6e5b43 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Wed, 14 Sep 2016 02:02:05 +0200 Subject: [PATCH 0142/2664] Git Miniconference at Plumbers link to thread on Git mailing list, and to Linux Plumber Conference site --- rev_news/drafts/edition-19.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index d8f55ce1ad..e9f303925e 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -397,6 +397,7 @@ you'd expect from zsh. * [Git User's Survey 2016](https://survs.com/survey/3cop1kt5eg) is out! * GitLab elaborates on their new round of founding in the [GitLab Master Plan](https://about.gitlab.com/2016/09/13/gitlab-master-plan/) * [Gmane has a new maintainer](http://lwn.net/Articles/699704/), which is good because we have a lot of old links pointing to Gmane in previous editions. +* Jon Loeliger [got enlisted](https://public-inbox.org/git/E1bhKNo-0005m2-5z@mylo.jdl.com/) to help run a [Miniconference on Git](https://www.linuxplumbersconf.org/2016/git-microconference-accepted-into-lpc-2016/) at Linux Plumber Conference __Git tips and tricks__ @@ -404,7 +405,6 @@ __Git tips and tricks__ * [Git Hot Tips](http://wesbos.com/git-hot-tips/) by Wes Bos * [Git diff tips and tricks](https://blog.twobucks.co/git-diff-tips-and-tricks/) by Hrvoje Šimić - __Light reading__ * [Git - Basic hygiene of working with repository](http://www.allinmobile.co/git-basic-hygiene-of-working-with-repository/) by Luke Konior From 9e5ca8b8886d13568731b9e1be9afae6b5694b85 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Wed, 14 Sep 2016 02:33:22 +0200 Subject: [PATCH 0143/2664] Link "see our emails" Minor issue: make 'at the bottom' link to the bottom of page, or rather the anchor for "Credits" header at bottom. --- rev_news/drafts/edition-19.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index d8f55ce1ad..afef90b562 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -276,7 +276,7 @@ people to join our small Git Rev News editor team. There is no need to even know Git well for that. It's possible to participate by just proofreading articles for example. Please contact -us (see our emails at the bottom) if you are interested. +us (see our emails [at the bottom](#credits)) if you are interested. ### Reviews From 646b0b2576b6b96b0d537cddcdb3cd7cbf312888 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 14 Sep 2016 08:04:28 +0200 Subject: [PATCH 0144/2664] rn-19: credit Jakub for his User Survey article --- rev_news/drafts/edition-19.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index 264e251495..0be6df1140 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -259,7 +259,7 @@ and uploaded Pranit passed the GSoC final evaluation. -* **[Git User's Survey 2016](https://survs.com/survey/3cop1kt5eg)** is open till **20 October 2016** +* **[Git User's Survey 2016](https://survs.com/survey/3cop1kt5eg)** is open till **20 October 2016** (*written by Jakub Narębski*) This year we will see the return of Git User's Survey (the last one was in 2012). The goal of the survey is mainly to help to understand who is From bfea2cb6c516aef8eff93f90ca33244b3dfbbab3 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 14 Sep 2016 08:14:51 +0200 Subject: [PATCH 0145/2664] rn-19: fix typos in User Survey article --- rev_news/drafts/edition-19.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index 0be6df1140..f224167f52 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -282,7 +282,7 @@ what is available (and which might had been not known). The questions were prepared with the help of Eric Wong and Andrew Adrill; the [[RFC] Proposed questions for "Git User's Survey 2016"](http://public-inbox.org/git/91a2ffbe-a73b-fbb9-96da-9aea4d439e5a@gmail.com/t/) -thread and its subthreads was posted to solicite feedback. +thread and its sub-threads was posted to solicit feedback. The survey was announced first on Git mailing list in [[ANNOUNCE] Git User's Survey 2016](http://public-inbox.org/git/de39c03d-e84e-8e45-69cb-a2e01fd25df2@gmail.com/) thread. @@ -309,7 +309,7 @@ https://tinyurl.com/GitSurvey2016-anon and created in 2006; its results can be found at [GitSurvey2006](https://git.wiki.kernel.org/index.php/GitSurvey2006) page on Git Wiki. So this year's survey is 10th anniversary of the first one. Since 2008 the Git User's Survey was hosted on -[Survs.com](https://survs.com) (then beta), thanks to generocity +[Survs.com](https://survs.com) (then beta), thanks to generosity of the site, who provides with recurring premium annual plan. * Thank you Nicola and call for help! From 59f2ec46cb4b33b64bb05044b59974cf52e880ca Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 14 Sep 2016 08:31:23 +0200 Subject: [PATCH 0146/2664] rn-19: fix typos all over the place --- rev_news/drafts/edition-19.md | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/rev_news/drafts/edition-19.md b/rev_news/drafts/edition-19.md index f224167f52..b238eb0f46 100644 --- a/rev_news/drafts/edition-19.md +++ b/rev_news/drafts/edition-19.md @@ -36,8 +36,8 @@ One of the most attended was Josh's presentation [video](https://www.youtube.com/watch?v=68XsuXlWiWU&index=23&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8)) about git-series. Josh had already [announced git-series on the mailing list](https://public-inbox.org/git/20160729064055.GB25331@x/) -which had generated some amount of dicussion about how the different -efforts to store more data and metadata related to patch series using +which had generated some amount of discussion about how the different +efforts to store more data and meta-data related to patch series using git itself could collaborate. In his talk Josh started by explaining the problems with the current @@ -75,10 +75,10 @@ series from. They also don't solve the problem of collaboration. One rule of collaboration is to never rewrite published history, but then how do -you collaborate on history that needs rewritting? +you collaborate on history that needs rewriting? Emailing patches back and forth is not a good solution for some kinds -of work like backporting a feature, preparing a distribution package, +of work like back-porting a feature, preparing a distribution package, rebasing stacks of patches sitting on top of upstream code. 'git-series' has been developed to fix all those problems. It tracks @@ -106,7 +106,7 @@ git series status -> -> Initial series commit -> Changes not staged for commit: --> (use "git series add ..." to update what will be commited) +-> (use "git series add ..." to update what will be committed) -> -> Added: base -> Added: base @@ -168,8 +168,8 @@ traversing the commits. Josh then gave more "minor details" about how it works. -Your current branch is refered by HEAD and the current series is -refered by refs/SHEAD, in which 'refs/' is needed for reachability. +Your current branch is referred by HEAD and the current series is +referred by refs/SHEAD, in which 'refs/' is needed for reachability. The working and staged states are respectively in: @@ -177,7 +177,7 @@ The working and staged states are respectively in: - refs/git-series-internals/staged/feature which both points to temporary commits. This is needed for -reachability of a not yet commited cover letter. +reachability of a not yet committed cover letter. Then Josh talked about his experience designing and developing git-series. @@ -188,7 +188,7 @@ suggested he might have a design flaw, so he redesigned to make the error impossible. One example of that is what happens when we detach from a series or -check out a new series with uncommited changes. First he had designed +check out a new series with uncommitted changes. First he had designed git-series to use only one staged and working version for a repository, so in this case he would have needed an error message to explain that you could lose some data and perhaps something like @@ -199,7 +199,7 @@ version there would be no need for such an error message and for a force option. Another example is what happens when you have created a new series and -made some change to it, but have not yet commited anything, and you +made some change to it, but have not yet committed anything, and you want to detach from it or checkout a new series. Git has the notion of an "unborn branch", as, when you create a repo, @@ -467,7 +467,7 @@ __Git tools and sites__ * [SparkleShare - Self hosted, instant, secure file sync](https://www.sparkleshare.org/) based on Git * [git-clean: A Command Line Tool written in Rust for cleaning up local and remote Git branches](https://github.com/mcasper/git-clean) * [Fork - a fast and friendly git client for Mac](https://git-fork.com/) -* [GitHeat](http://www.mustafa-s.com/Githeat/) - Interactive heatmaps for your git repositories +* [GitHeat](http://www.mustafa-s.com/Githeat/) - Interactive heat-maps for your git repositories * [Git Undo](http://megakemp.com/2016/08/25/git-undo/) is a neat little alias for getting stuff out of the reflog * [literate-git: Render hierarchical git repositories into HTML](https://github.com/bennorth/literate-git/) - see a demo of it [here](http://www.redfrontdoor.org/20160813-literate-git-demo/index.html) From 11dd7a356ac4a884b9ae3f27db4a014ce9bc4479 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 14 Sep 2016 14:34:45 +0200 Subject: [PATCH 0147/2664] Publish rn-19 in _posts/ --- .../drafts/edition-19.md => _posts/2016-09-14-edition-19.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-19.md => _posts/2016-09-14-edition-19.markdown (100%) diff --git a/rev_news/drafts/edition-19.md b/_posts/2016-09-14-edition-19.markdown similarity index 100% rename from rev_news/drafts/edition-19.md rename to _posts/2016-09-14-edition-19.markdown From 01971eea26c13a703e98022033eb8a01e882ddee Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 17 Aug 2016 12:30:01 +0200 Subject: [PATCH 0148/2664] Add draft for rn-20 --- rev_news/drafts/edition-20.md | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 rev_news/drafts/edition-20.md diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md new file mode 100644 index 0000000000..db28737e02 --- /dev/null +++ b/rev_news/drafts/edition-20.md @@ -0,0 +1,49 @@ +--- +title: Git Rev News Edition 20 (XXX, 2016) +layout: default +date: 2016-10-17 12:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 20 (XXX, 2016) + +Welcome to the 20th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). + +This edition covers what happened during the month of September 2016. + +## Discussions + + + + + + + +## Releases + + +## Other News + +__Various__ + + +__Light reading__ + + +__Git tools and sites__ + + +## Credits + +This edition of Git Rev News was curated by Christian Couder <> and +Thomas Ferris Nicolaisen <>, with help from XXX. From f58aed021660b249041ee793afcace08fa0f0d00 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 14 Sep 2016 14:40:12 +0200 Subject: [PATCH 0149/2664] rn-19: add period at the end of list item --- _posts/2016-09-14-edition-19.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2016-09-14-edition-19.markdown b/_posts/2016-09-14-edition-19.markdown index b238eb0f46..b9e37ec4bb 100644 --- a/_posts/2016-09-14-edition-19.markdown +++ b/_posts/2016-09-14-edition-19.markdown @@ -29,7 +29,7 @@ from August 22 to August 24, and they happened to be recorded: - [Versions All the Way Down: Versioning Commits and Patches with Git-Series by Josh Triplett, Intel](https://www.youtube.com/watch?v=68XsuXlWiWU&index=23&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8). - [Tracking Huge Files with Git LFS by Tim Pettersen, Atlassian](https://www.youtube.com/watch?v=yuKAV5cCcTw&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8&index=24). - [Terrible Ideas in Git by Corey Quinn, FutureAdvisor](https://www.youtube.com/watch?v=Wr7ulql0Exo&index=25&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8). - - [Git and Testing by your own Christian Couder](https://www.youtube.com/watch?v=TcgyVWBg8EQ&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8&index=26) + - [Git and Testing by your own Christian Couder](https://www.youtube.com/watch?v=TcgyVWBg8EQ&list=PLGeM09tlguZQyemL0Y5CdpEFrBs-hGGM8&index=26). One of the most attended was Josh's presentation ([slides](http://events.linuxfoundation.org/sites/events/files/slides/git-series.pdf), From 2a2c7a80189a8e0a4bef7873beb1cc500107ea16 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 14 Sep 2016 14:50:41 +0200 Subject: [PATCH 0150/2664] rn-19: add Lars among the helpers --- _posts/2016-09-14-edition-19.markdown | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_posts/2016-09-14-edition-19.markdown b/_posts/2016-09-14-edition-19.markdown index b9e37ec4bb..e95583342d 100644 --- a/_posts/2016-09-14-edition-19.markdown +++ b/_posts/2016-09-14-edition-19.markdown @@ -474,4 +474,5 @@ __Git tools and sites__ ## Credits This edition of Git Rev News was curated by Christian Couder <> and -Thomas Ferris Nicolaisen <>, with help from Brian M. Carlson, Jakub Narębski and Josh Triplett. +Thomas Ferris Nicolaisen <>, with help from Brian M. Carlson, Jakub Narębski, +Lars Schneider and Josh Triplett. From dbee0adfed7bfa5463b7d87249f2104c62dab638 Mon Sep 17 00:00:00 2001 From: Romain Vimont Date: Wed, 14 Sep 2016 21:45:08 +0200 Subject: [PATCH 0151/2664] Make web browsers aware of RSS feed Add RSS feed to the html head so that web browsers can expose the RSS feed directly. --- _layouts/default.html | 1 + 1 file changed, 1 insertion(+) diff --git a/_layouts/default.html b/_layouts/default.html index 3128380801..2887d3b7e6 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -6,6 +6,7 @@ {{ page.title }} + From 1f4b680ed4bdfea5a9238707ef0e51d8e193736a Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 14 Sep 2016 23:08:55 +0200 Subject: [PATCH 0152/2664] rn-19: improve Git CI stats link description --- _posts/2016-09-14-edition-19.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/2016-09-14-edition-19.markdown b/_posts/2016-09-14-edition-19.markdown index e95583342d..0b8d706d21 100644 --- a/_posts/2016-09-14-edition-19.markdown +++ b/_posts/2016-09-14-edition-19.markdown @@ -462,7 +462,7 @@ __Light reading__ __Git tools and sites__ -* [Git CI stats](https://larsxschneider.github.io/git-ci-stats/) - List all commits of a given branch and visualize the CI status, CI execution time, and failing test +* [Git CI stats](https://larsxschneider.github.io/git-ci-stats/) - shows the Travis CI build charts for the Git project itself, including result, build time and test results for every single commit. * [git-fiddle: Edit commit messages, authors and timestamps during git-rebase](https://github.com/felixSchl/git-fiddle) * [SparkleShare - Self hosted, instant, secure file sync](https://www.sparkleshare.org/) based on Git * [git-clean: A Command Line Tool written in Rust for cleaning up local and remote Git branches](https://github.com/mcasper/git-clean) From a9557011946b700dccb8b77fc9cfa8030571a831 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 15 Oct 2016 12:36:20 +0200 Subject: [PATCH 0153/2664] rn-20: fix publication date to October 20th --- rev_news/drafts/edition-20.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index db28737e02..c2e3a7e6c0 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -1,13 +1,13 @@ --- -title: Git Rev News Edition 20 (XXX, 2016) +title: Git Rev News Edition 20 (October 19th, 2016) layout: default -date: 2016-10-17 12:06:51 +0100 +date: 2016-10-19 12:06:51 +0100 author: chriscool categories: [news] navbar: false --- -## Git Rev News: Edition 20 (XXX, 2016) +## Git Rev News: Edition 20 (October 19th, 2016) Welcome to the 20th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to From b38427fc39170b0bf5159c1e032024f60fa2f9e3 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 16 Oct 2016 09:46:49 +0200 Subject: [PATCH 0154/2664] rn-20: add article about rebase -i speed up --- rev_news/drafts/edition-20.md | 104 +++++++++++++++++++++++++++++++++- 1 file changed, 102 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index c2e3a7e6c0..894204fd6b 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -21,9 +21,109 @@ This edition covers what happened during the month of September 2016. ### General --> - + +* [Prepare the sequencer for the upcoming rebase -i patches](http://public-inbox.org/git/cover.1472457609.git.johannes.schindelin@gmx.de/) + +Johannes Schindelin, alias Dscho, is the maintainer of Git for +Windows. He is working for Microsoft and, on top of his maintainer +role, he has been working whenever time allowed since February this +year to speed up interactive rebase (`git rebase -i`). + +Since when it was created in 2005, the `git rebase` command has been +implemented using shell scripts that are calling other git commands. + +The interactive rebase that Dscho implemented in 2007 calls different +commands than the regular, non interactive, rebase. The regular rebase +uses `git format-patch` to create a patch series from some commits, +and then `git am` to apply this patch series on top of a different +commit, while the interactive rebase calls `git cherry-pick` +repeatedly for the same purpose. + +Neither of these approaches has been very efficient though, and the +main reason behind that is that repeatedly calling a git command has a +significant overhead. Even the regular `git rebase` would do that as +`git am` had been implemented by launching `git apply` on each of the +patches. + +The overhead is especially big on Windows were creating a new process +is quite slow, but even on other OSes it requires setting up +everything from scratch, then reading the index from disk, and then, +after performing some changes, writing the index back to the disk. + +In case of the regular rebase, +[a patch series has been merged recently](https://github.com/git/git/commit/81358dc238372793b1590efa149cc1581d1fbd98) +to the 'master' branch that makes `git am` call `git apply`'s internal +functions without spawning the latter as a separate process. So the +regular rebase will be significantly faster especially on Windows and +for big repositories in the next Git feature release. + +Dscho's work achieves the same kind of results for the interactive +rebase. The work, which has been distilled to the mailing list has a +series of patch series, greatly improves and then uses a mechanism +called the sequencer. + +The sequencer had been from it's beginning +[in 2008 as a GSoC (Google Summer of Code) project](https://git.wiki.kernel.org/index.php/SoC2008Ideas#Implement_git-sequencer) +envisioned as a low-level patch-application engine written in C that +would "take the 'todo' file format used by git-rebase -i and extend it +to also support applying patches split out of mbox files", so that +"frontends like git-am, git-rebase, etc. can then setup the 'todo' +script and pass it to git-sequencer, which does the actual patch +application, editing, etc." + +Of course it was a too much ambitious project for a GSoC project, so +the work that Stephan Beyer, the GSoC student at that time, did to +implement it was not merged. A lot of great related work by Stephan +had been merged though, and the sequencer idea as well as Stephan's +code were still considered valuable, so that in 2011 +[another GSoC project was attempted](https://git.wiki.kernel.org/index.php/SoC2011Ideas#git_cherry-pick_--continue.2F--abort.2F--skip_and_git_sequencer) +to further the idea and Stephan's code. This time the goal was to +first use the sequencer to improve cherry-picking, and reverting, many +commits, and Ramkumar Ramachandra, alias Ram, succeeded. The sequencer +code got merged and it was now possible to "continue", "abort" or +"skip" when cherry-picking or reverting many commits. + +Despite this success, Dscho has had to improve a lot of things to make +it possible to reuse the sequencer in the interactive rebase. For +example he had to create a git-rebase--helper in C that ported a lot +of the functionality from the git-rebase--interactive.sh shell +script. + +As Dscho explains [in an answer to a question by Jakub Narębski](http://public-inbox.org/git/alpine.DEB.2.20.1609021432070.129229@virtualbox/), +who asked about the status of the patch series, 10 of his patch series +had already been accepted, 5 were in flight and 1 had not yet been +submitted at the beginning of September. + +These patch series, will speed up the interactive rebase, but are not +enough to fully replace the rebase implementation in shell by one in +C. According to Dscho such a result is "*far, far, far* in the future": + +> ...my hope is that the rebase--helper work is only an initial step, +> opening the door for other contributors to tackle independent parts +> of making git-rebase a builtin + +Though the patch series have been reviewed by a large number of +experienced Git developers like Junio Hamano, Johannes Sixt, Torsten +Bögershausen, Jeff King, Jakub Narębski, Dennis Kaarsemaker, Eric +Sunshine, Kevin Daudt and Stefan Beller, they are not fully merged +into Git yet. But Dscho already "integrated the whole shebang into Git +for Windows 2.10.0 and 2.10.1" that were released recently, and "it +has been running without complaints (and some quite positive +feedback)". + +About the performance improvements, Dscho wrote: + +> The end game of this patch series is a git-rebase--helper that makes +> rebase -i 5x faster on Windows (according to t/perf/p3404). Travis says +> that even MacOS X and Linux benefit (4x and 3x, respectively). + +Such performance improvements as well as the code consolidations +around the sequencer are of course very nice. It is interesting and +satisfying to see that they are the result of building on top of +previous work over the years by GSoC students, mentors and reviewers. + + +* [Why are there multiple ways to get the manual in Git?](https://public-inbox.org/git/CAM_5GX48gDAZSvAWnxO5n8uhYf8vmfAJ88_31_ewsQxyPfF7iA@mail.gmail.com/) + +Andrew Johnson asked on the mailing list: + +> While reading Pro Git 2nd Ed. I came across these three methods: +> +> $ git help +> $ git --help +> $ man git- +> +> I tested all three to confirm they were equivalent. +> +> What was the motivation behind the complication, if any? I presume +> most developers would not provide multiple commands that do the same +> thing for absolutely no reason, so I led myself to ask this question. + +Fredrik Gustafsson was the first to answer. He first said that the +three commands are not actually equivalent on Windows as: + +> $ man git- +> +> does not work and +> +> $ git help +> +> opens a webbrowser instead of a man page. + +Philip Oakley then answered that the three different methods were +added at different times for different reasons. The man methods was +first added because "historically git was a set of shell scripts named +git-*, so each stood alone". + +The --help was the result from "the modern `git ' approach, with +every command normally having -h and --help options for short form +usage and long form man pages". Meanwhile "a `git help ` command +was created" which "allowed selection of display type, so that on +Unix/Linux man was the norm, while an --html (or --web) option is +available for those who like the pretty browser view". + +Your own Christian Couder chimed in saying that `git help` makes it +possible to teach people one command that will do something sensible +on every system, and that it also "provides more configurability and +more features like its -a and -g options". + +Jakub Narębski added that there are also help pages that are about +"concepts (gitcli, gitrevisions, githooks, gitrepository-layout, +gitglossary), or about files (gitignore, gitattributes, to some extent +githooks)" and they are "only accessible with `git help ` or, +on OS with installed 'man', also `man `". + +Philip replied to the above saying that "`git revisions --help` does +work", but Junio Hamano clarified things by saying that this was a bug +that had been recently fixed. + +It would indeed seem wrong to have `git --help` working, as +concepts are not the same things as commands. + +Anyway this shows that it is not so simple to design a good help +system, especially one that is both full featured on different +platforms and looking simple to users. + ## Releases From d773545bcc18c987c7dbfdf5348bb81ab6f244ee Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 16 Oct 2016 22:02:25 +0200 Subject: [PATCH 0158/2664] rn-20: fix markup in git help related article --- rev_news/drafts/edition-20.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index 5bc09ecf05..b455ea567e 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -133,9 +133,9 @@ Andrew Johnson asked on the mailing list: > While reading Pro Git 2nd Ed. I came across these three methods: > -> $ git help -> $ git --help -> $ man git- +> $ git help <verb>
+> $ git <verb> ‐‐help
+> $ man git‐<verb>
> > I tested all three to confirm they were equivalent. > @@ -146,11 +146,11 @@ Andrew Johnson asked on the mailing list: Fredrik Gustafsson was the first to answer. He first said that the three commands are not actually equivalent on Windows as: -> $ man git- +> $ man git‐<verb> > > does not work and > -> $ git help +> $ git help <verb> > > opens a webbrowser instead of a man page. From 50c18505954a7c47b06fe6db7a5121645d3b480e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sun, 16 Oct 2016 22:07:47 +0200 Subject: [PATCH 0159/2664] rn-20: fix more markup in git help related article --- rev_news/drafts/edition-20.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index b455ea567e..bd4b2d4472 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -159,17 +159,17 @@ added at different times for different reasons. The man methods was first added because "historically git was a set of shell scripts named git-*, so each stood alone". -The --help was the result from "the modern `git ' approach, with -every command normally having -h and --help options for short form +The ‐‐help was the result from "the modern `git ` approach, with +every command normally having ‐h and ‐‐help options for short form usage and long form man pages". Meanwhile "a `git help ` command was created" which "allowed selection of display type, so that on -Unix/Linux man was the norm, while an --html (or --web) option is +Unix/Linux man was the norm, while an ‐‐html (or ‐‐web) option is available for those who like the pretty browser view". Your own Christian Couder chimed in saying that `git help` makes it possible to teach people one command that will do something sensible on every system, and that it also "provides more configurability and -more features like its -a and -g options". +more features like its ‐a and ‐g options". Jakub Narębski added that there are also help pages that are about "concepts (gitcli, gitrevisions, githooks, gitrepository-layout, From 8f9c3064fdb5eb2f8593764458dd23694114834f Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Sun, 16 Oct 2016 16:30:59 -0700 Subject: [PATCH 0160/2664] rn-20: add link to large Git repos post --- rev_news/drafts/edition-20.md | 1 + 1 file changed, 1 insertion(+) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index bd4b2d4472..45a9162423 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -198,6 +198,7 @@ __Various__ __Light reading__ +* [What is a "large" Git repository?](http://larsxschneider.github.io/2016/09/21/large-git-repos) by Lars Schneider __Git tools and sites__ From 924e608cbd434c7ed99ce13c95f7ca7cc19cb789 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Mon, 17 Oct 2016 10:51:45 +0200 Subject: [PATCH 0161/2664] Rev News: mention Git/Git for Windows releases Signed-off-by: Johannes Schindelin --- rev_news/drafts/edition-20.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index 45a9162423..e9f206b9ff 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -191,6 +191,9 @@ platforms and looking simple to users. ## Releases +* [Git 2.10.1](https://public-inbox.org/git/xmqqvax93w1c.fsf@gitster.mtv.corp.google.com/) +* [Git for Windows 2.10.1](https://github.com/git-for-windows/git/releases/tag/v2.10.1.windows.1) + ## Other News From e949bc3ab44f5c6d3890941688b9f699c6c3f1bb Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Tue, 18 Oct 2016 00:24:44 +0200 Subject: [PATCH 0162/2664] rn-20: add links --- rev_news/drafts/edition-20.md | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index e9f206b9ff..cdbd7e0ff8 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -193,21 +193,44 @@ platforms and looking simple to users. * [Git 2.10.1](https://public-inbox.org/git/xmqqvax93w1c.fsf@gitster.mtv.corp.google.com/) * [Git for Windows 2.10.1](https://github.com/git-for-windows/git/releases/tag/v2.10.1.windows.1) +* [libgit2 v0.24.2 Maintenance Release](https://github.com/libgit2/libgit2/releases/tag/v0.24.2) +* [libgit2/rugged v0.25.0b10](https://github.com/libgit2/rugged/releases/tag/v0.25.0b10) +* [GitLab 8.12](https://about.gitlab.com/2016/09/22/gitlab-8-12-released/) released and patched up to [8.12.7](https://about.gitlab.com/2016/10/17/gitlab-8-dot-12-dot-7-released/) ## Other News __Various__ +* Here is [git-test-repository: A Git repository full of special cases, for testing purposes](https://github.com/book/git-test-repository) - very handy when you're testing out a new a new Git GUI or repository manager. +* [A Visual Git Reference](http://marklodato.github.io/visual-git-guide/index-en.html) by Mark Lodato +* [Automate Git and Upgrade Your Battle Station With a Custom Peripheral](https://hackaday.com/2016/09/13/automate-git-and-upgrade-your-battle-station-with-a-custom-peripheral/) by Gerrit Coetzee +* [Command equivalents in Git, Mercurial, and Subversion](http://blog.deveo.com/list-of-equivalent-commands-in-git-mercurial-and-svn/) by Antti Kirmanen +* [GitHub Classroom as Textbook and Workbook](https://blog.skilstak.io/github-as-text-book-and-work-book-828ffada9542#.vy1vivkrq) by Rob Muhlestein +* [Gerrit Summit 2016 is coming](https://gitenterprise.me/2016/10/10/gerrit-summit-2016-is-coming/) __Light reading__ + * [What is a "large" Git repository?](http://larsxschneider.github.io/2016/09/21/large-git-repos) by Lars Schneider +* [Purposes, Concepts, Misfits, and a Redesign of Git](http://neverworkintheory.org/2016/09/30/rethinking-git.html) is a research paper, here discussed by Greg Wilson. It lead to a [discussion on the Git mailing list](https://public-inbox.org/git/ce42f934-4a94-fa29-cff0-5ebb0f004eb5@gmail.com/T/#e95875b7940512b432ab2e29b3dd50ca448df9720). +* [Gitless](http://gitless.com/) is the experimental reworking of Git based on the research in the previous link +* [Poking around /usr/lib/git-core](http://kamalmarhubi.com/blog/2016/10/07/git-core/) by Kamal Marhubi +* [Lesser known Git commands](https://hackernoon.com/lesser-known-git-commands-151a1918a60#.jwubgvjwe) by Tim Pettersen __Git tools and sites__ +* [gittup.org](http://gittup.org/gittup/) is a Linux distribution based on Git and Tup +* [git-stacktrace: Easily figure out which git commit caused a given stacktrace](https://github.com/pinterest/git-stacktrace) +* [Legit (Git Workflow for Humans)](http://www.git-legit.org/) +* [Tower for Windows - Public Beta has Started](https://www.git-tower.com/blog/tower-for-windows-public-beta/) +* [Git-Repo The ultimate utility for managing services](http://i.got.nothing.to/code/on/git-repo:_the_utility_for_services/) +* [patchwork](http://jk.ozlabs.org/projects/patchwork/) - a web-based patch tracking system designed to facilitate the contribution and management of contributions to an open-source project. +* [ripgrep](http://blog.burntsushi.net/ripgrep/) is arguably the fastest grep-replacement out there, and it respects your .gitignore files. +* [GitPitch](https://about.gitlab.com/2016/10/03/gitpitch-slideshow-presentations-for-developers-on-gitlab/) from GitLab lets you create slideshow presentations in Markdown and host them in a Git repository. ## Credits This edition of Git Rev News was curated by Christian Couder <> and -Thomas Ferris Nicolaisen <>, with help from XXX. +Thomas Ferris Nicolaisen <>, with help from Jakub Narębski, Johannes Schindelin +and Lars Schneider. From e508bd818b95a88b09463a715909b248b7984908 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 18 Oct 2016 12:23:38 +0200 Subject: [PATCH 0163/2664] rn-20: fix repetition in git-test-repository link --- rev_news/drafts/edition-20.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index cdbd7e0ff8..c0389ec3a3 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -202,7 +202,7 @@ platforms and looking simple to users. __Various__ -* Here is [git-test-repository: A Git repository full of special cases, for testing purposes](https://github.com/book/git-test-repository) - very handy when you're testing out a new a new Git GUI or repository manager. +* Here is [git-test-repository: A Git repository full of special cases, for testing purposes](https://github.com/book/git-test-repository) - very handy when you're testing out a new Git GUI or repository manager. * [A Visual Git Reference](http://marklodato.github.io/visual-git-guide/index-en.html) by Mark Lodato * [Automate Git and Upgrade Your Battle Station With a Custom Peripheral](https://hackaday.com/2016/09/13/automate-git-and-upgrade-your-battle-station-with-a-custom-peripheral/) by Gerrit Coetzee * [Command equivalents in Git, Mercurial, and Subversion](http://blog.deveo.com/list-of-equivalent-commands-in-git-mercurial-and-svn/) by Antti Kirmanen From 76c1c487418f76b2a9d671bcbb62e87e0d62b4b1 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Tue, 18 Oct 2016 13:51:24 +0200 Subject: [PATCH 0164/2664] rn-20: add Dennis' interview --- rev_news/drafts/edition-20.md | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index c0389ec3a3..23dc6c3e16 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -189,6 +189,55 @@ system, especially one that is both full featured on different platforms and looking simple to users. +## Developer Spotlight: Dennis Kaarsemaker + +* Who are you and what do you do? + +I'm Dennis Kaarsemaker, I do scalability and security things for +Booking.com, part of which includes hacking on our git infrastructure +together with Ævar Arnfjörð Bjarmason. I also maintain +perl5.git.perl.org and do a lot of user support. + +* What would you name your most important contribution to Git? + +Spending a lot of time in #git and #github on freenode solving people's +git problems. Occasionally this leads to bug reports or even patches, +but mostly I'm trying to create make users understand git and make them +smile. + +* What are you doing on the Git project these days, and why? + +Besides user support, I do read the mailing-list and try to review +patches or pick up smaller bugs as time permits. Time however is scarce +with a fearless 14 month old girl crawling around the house trying to +get into trouble :) + +* If you could get a team of expert developers to work full time on + something in Git for a full year, what would it be? + +If I had a team of developers, their core focus would be scalability +for very big repositories. Things like a protocol that is efficient +with hundreds of thousands of refs and can be load-balanced properly, or +more efficient storage for refs, external files and other data. Or a +peer to peer continuous sync protocol for the object store. + +* If you could remove something from Git without worrying about + backwards compatibility, what would it be? + +Oh, if only I could remove submodules. They're almost universally used +for the wrong reason, are easy to get confused about and use wrong, and +they complicate many parts of git. + +* What is your favorite Git-related tool/library, outside of Git itself? + +Definitely GitHub. I appreciate that Git is made for distributed +version control, and regularly use it in that way; but the social +benefits of having a single place to discover, maintain and collaborate +on projects that GitHub offers really helps in getting the most out of +my open source experience. I even made a command line API client for +Github, GitLab and BitBucket :) + + ## Releases * [Git 2.10.1](https://public-inbox.org/git/xmqqvax93w1c.fsf@gitster.mtv.corp.google.com/) From aa98af14ccaec54dfd7b33ac975c2156f5571c41 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Tue, 18 Oct 2016 23:25:02 +0200 Subject: [PATCH 0165/2664] Reviews: expand a but about interactive rebase work Add an information from Dscho about the use of Scientist library to ensure that the patches making interactive rebase faster are in fact correct. I'm not sure if the new information is well connected to the rest of it; as it is now, this point has actually two endings... --- rev_news/drafts/edition-20.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index c0389ec3a3..7e3b3ad498 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -124,6 +124,29 @@ around the sequencer are of course very nice. It is interesting and satisfying to see that they are the result of building on top of previous work over the years by GSoC students, mentors and reviewers. +Dscho wrote about making _interactive rebase_ much faster in the +blog post [What’s new in Git for Windows 2.10?](https://blogs.msdn.microsoft.com/visualstudioalm/2016/09/03/whats-new-in-git-for-windows-2-10/) +(linked to in previous Git Rev News), repeating and extending information +from above-mentioned answer. Among others, he wrote how can he be sure +that the code is ready: + +> The answer: I verified it. Inspired by [GitHub’s blog post on their +> Scientist library](http://githubengineering.com/scientist/), I taught +> my personal Git version to cross-validate each and every interactive +> rebase that I performed since the middle of May. That is, each and every +> interactive rebase I ran was first performed using the original shell +> script, then using the `git rebase--helper`, and then the results were +> confirmed to be identical (modulo time stamps). + +And further: + +> Full disclosure: the cross-validation did find three regressions that +> were not caught by the regression test suite (which I have subsequently +> adjusted to test for those issues, of course). So it was worth the effort. + +One can find which regressions were there in the [followup on git mailing list](http://public-inbox.org/git/alpine.DEB.2.20.1609111010440.129229@virtualbox/). +It is interesting to find the use of the [Scientist library](https://github.com/github/scientist) +for ensuring the quality of Git code refactoring. ### Support From 43dbcf6ff0dd076e2b976676b1cc6c161f816fe4 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Tue, 18 Oct 2016 23:39:30 +0200 Subject: [PATCH 0166/2664] Other News: Git User's Survey 2016 ends soon Just a reminder for those who have not answered yet. --- rev_news/drafts/edition-20.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index c0389ec3a3..a617a5c30e 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -200,6 +200,10 @@ platforms and looking simple to users. ## Other News +__Events__ + +* [Git User's Survey 2016](https://survs.com/survey/3cop1kt5eg) ends soon, on 20 October 2016 + __Various__ * Here is [git-test-repository: A Git repository full of special cases, for testing purposes](https://github.com/book/git-test-repository) - very handy when you're testing out a new Git GUI or repository manager. From 1565bc51d45c7ae8eb7adb8d1811e7e15613a4d9 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Wed, 19 Oct 2016 00:58:41 +0200 Subject: [PATCH 0167/2664] rn20: Changing the default for "core.abbrev"? Add discussion about changing the default abbrev length and dealing with abbreviated SHA-1s. --- rev_news/drafts/edition-20.md | 40 +++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index c0389ec3a3..06c2392de3 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -24,6 +24,46 @@ This edition covers what happened during the month of September 2016. ### Reviews +* [Changing the default for "core.abbrev"?](http://public-inbox.org/git/CA+55aFy0_pwtFOYS1Tmnxipw9ZkRNCQHmoYyegO00pjMiZQfbg@mail.gmail.com/) + +Linus Torvalds asked for increasing the default value for number of +characters in SHA-1 abbreviations. The `default_abbrev = 7` was +reasonable at early days of Git, but the project of size of the +Linux kernel needs `git config --global core.abbrev 12`; while Git +will extend the seven hex digits until the object name is unique, +that only reflects the *current* situation in the repository. It gets +annoying when a commit message has a short git ID that is no longer +unique a few months later when one needs to go back and try to figure +out what went wrong in that commit. + +Jeff King, alias Peff, answered the *"it gets annoying"* part in the +[[PATCH 0/10] helping people resolve ambiguous sha1s](https://public-inbox.org/git/20160926115720.p2yb22lcq37gboon@sigill.intra.peff.net/) +patch series (merged in [66c22ba6](https://git.kernel.org/cgit/git/git.git/commit/?id=66c22ba6fbe0724ecce3d82611ff0ec5c2b0255f)). +This patch series taught Git to help in the situation where only +ambiguous shortened identifier is available, by listing the SHA-1s +of the objects it found, along with a few bits of information that +may help the user decide which one they meant. + +> $ git rev-parse b2e1 +> error: short SHA1 b2e1 is ambiguous +> hint: The candidates are: +> hint: b2e1196 tag v2.8.0-rc1 +> hint: b2e11d1 tree +> hint: b2e1632 commit 2007-11-14 - Merge branch 'bs/maint-commit-options' +> hint: b2e1759 blob +> hint: b2e18954 blob +> hint: b2e1895c blob + +The problem of Git providing SHA-1 abbreviation which would soon be +invalid was solved in different way than proposed by Linus. Instead +of increasing the default abbrev length for all projects, making abbrevs +longer and more unwieldy also for small projects that don't need it, +Peff [proposed](https://public-inbox.org/git/20160929092204.eod2cvtrqg5whu6h@sigill.intra.peff.net/) +to make default abbrev length be dynamically based on the number of objects +in the repository. Linus sent [rough implementation](https://public-inbox.org/git/CA+55aFwbCNiF0nDppZ5SuRcZwc9kNvKYzgyd_bR8Ut8XRW_p4Q@mail.gmail.com/) +of this idea, which after a few iterations (and cleanups of related code) +got merged into 'next' as [bb188d00f7](https://github.com/git/git/commit/bb188d00f7). + * [Prepare the sequencer for the upcoming rebase -i patches](http://public-inbox.org/git/cover.1472457609.git.johannes.schindelin@gmx.de/) Johannes Schindelin, alias Dscho, is the maintainer of Git for From f255c35b52dda0af32159867312e23c819583a9c Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 19 Oct 2016 10:06:31 +0200 Subject: [PATCH 0168/2664] rn-20: small fixes to Jakub's article --- rev_news/drafts/edition-20.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index 6609fb2df9..55a9d9eef9 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -28,8 +28,8 @@ This edition covers what happened during the month of September 2016. Linus Torvalds asked for increasing the default value for number of characters in SHA-1 abbreviations. The `default_abbrev = 7` was -reasonable at early days of Git, but the project of size of the -Linux kernel needs `git config --global core.abbrev 12`; while Git +reasonable in the early days of Git, but a project of the size of the +Linux kernel needs `git config --global core.abbrev 12`. While Git will extend the seven hex digits until the object name is unique, that only reflects the *current* situation in the repository. It gets annoying when a commit message has a short git ID that is no longer From 5240da53a4960339c2950c81f69bebb67c9ab51e Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 19 Oct 2016 10:11:05 +0200 Subject: [PATCH 0169/2664] rn-20: better credit Jakub and Peff --- rev_news/drafts/edition-20.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index 55a9d9eef9..4401f921c3 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -24,7 +24,7 @@ This edition covers what happened during the month of September 2016. ### Reviews -* [Changing the default for "core.abbrev"?](http://public-inbox.org/git/CA+55aFy0_pwtFOYS1Tmnxipw9ZkRNCQHmoYyegO00pjMiZQfbg@mail.gmail.com/) +* [Changing the default for "core.abbrev"?](http://public-inbox.org/git/CA+55aFy0_pwtFOYS1Tmnxipw9ZkRNCQHmoYyegO00pjMiZQfbg@mail.gmail.com/) (*written by Jakub Narębski*) Linus Torvalds asked for increasing the default value for number of characters in SHA-1 abbreviations. The `default_abbrev = 7` was @@ -325,5 +325,5 @@ __Git tools and sites__ ## Credits This edition of Git Rev News was curated by Christian Couder <> and -Thomas Ferris Nicolaisen <>, with help from Jakub Narębski, Johannes Schindelin -and Lars Schneider. +Thomas Ferris Nicolaisen <>, with help from Jakub Narębski, Johannes Schindelin, +Lars Schneider and Jeff King. From d1c36196ce51fa6a04eacecb9d3b5120ef55e2ac Mon Sep 17 00:00:00 2001 From: Thomas Ferris Nicolaisen Date: Wed, 19 Oct 2016 11:45:59 +0200 Subject: [PATCH 0170/2664] rn-20: improve links --- rev_news/drafts/edition-20.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index 4401f921c3..99bb4774cf 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -292,6 +292,7 @@ Github, GitLab and BitBucket :) __Events__ * [Git User's Survey 2016](https://survs.com/survey/3cop1kt5eg) ends soon, on 20 October 2016 +* [Gerrit Summit 2016 is coming](https://gitenterprise.me/2016/10/10/gerrit-summit-2016-is-coming/) __Various__ @@ -300,7 +301,6 @@ __Various__ * [Automate Git and Upgrade Your Battle Station With a Custom Peripheral](https://hackaday.com/2016/09/13/automate-git-and-upgrade-your-battle-station-with-a-custom-peripheral/) by Gerrit Coetzee * [Command equivalents in Git, Mercurial, and Subversion](http://blog.deveo.com/list-of-equivalent-commands-in-git-mercurial-and-svn/) by Antti Kirmanen * [GitHub Classroom as Textbook and Workbook](https://blog.skilstak.io/github-as-text-book-and-work-book-828ffada9542#.vy1vivkrq) by Rob Muhlestein -* [Gerrit Summit 2016 is coming](https://gitenterprise.me/2016/10/10/gerrit-summit-2016-is-coming/) __Light reading__ @@ -309,6 +309,7 @@ __Light reading__ * [Gitless](http://gitless.com/) is the experimental reworking of Git based on the research in the previous link * [Poking around /usr/lib/git-core](http://kamalmarhubi.com/blog/2016/10/07/git-core/) by Kamal Marhubi * [Lesser known Git commands](https://hackernoon.com/lesser-known-git-commands-151a1918a60#.jwubgvjwe) by Tim Pettersen +* [Why kernel development still uses email](http://lwn.net/Articles/702177/) by Jonathan Corbet __Git tools and sites__ From 23f9abea01a9fd97b6f0904795cf20c9a6598592 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 19 Oct 2016 12:12:50 +0200 Subject: [PATCH 0171/2664] rn-20: make an article from Jakub's additions --- rev_news/drafts/edition-20.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index 613d356cdc..4e5fce76ec 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -164,11 +164,13 @@ around the sequencer are of course very nice. It is interesting and satisfying to see that they are the result of building on top of previous work over the years by GSoC students, mentors and reviewers. -Dscho wrote about making _interactive rebase_ much faster in the -blog post [What’s new in Git for Windows 2.10?](https://blogs.msdn.microsoft.com/visualstudioalm/2016/09/03/whats-new-in-git-for-windows-2-10/) +* [What’s new in Git for Windows 2.10?](https://blogs.msdn.microsoft.com/visualstudioalm/2016/09/03/whats-new-in-git-for-windows-2-10/) (*written by Jakub Narębski*) + +Dscho wrote about making _interactive rebase_ much faster in a recent +[blog post](https://blogs.msdn.microsoft.com/visualstudioalm/2016/09/03/whats-new-in-git-for-windows-2-10/) (linked to in previous Git Rev News), repeating and extending information -from above-mentioned answer. Among others, he wrote how can he be sure -that the code is ready: +from his answer mentioned in the above article. Among others, he wrote +how can he be sure that the code is ready: > The answer: I verified it. Inspired by [GitHub’s blog post on their > Scientist library](http://githubengineering.com/scientist/), I taught @@ -188,6 +190,7 @@ One can find which regressions were there in the [followup on git mailing list]( It is interesting to find the use of the [Scientist library](https://github.com/github/scientist) for ensuring the quality of Git code refactoring. + ### Support * [Why are there multiple ways to get the manual in Git?](https://public-inbox.org/git/CAM_5GX48gDAZSvAWnxO5n8uhYf8vmfAJ88_31_ewsQxyPfF7iA@mail.gmail.com/) From d42faa3871a05046bf6b57f9efe54c291af2abea Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Wed, 19 Oct 2016 12:23:17 +0200 Subject: [PATCH 0172/2664] rn20: musl libc vs NO_REGEX / REG_STARTEND Add description of discussion about Git no longer working with musl libc's regex implementation out of the box (without setting `NO_REGEX=1` in build configuration). --- rev_news/drafts/edition-20.md | 51 +++++++++++++++++++++++++++++++++-- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index c0389ec3a3..e7bf38bb79 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -17,9 +17,56 @@ This edition covers what happened during the month of September 2016. ## Discussions - + +* [Regression: git no longer works with musl libc's regex impl](https://public-inbox.org/git/20161004150848.GA7949@brightrain.aerifal.cx/) + +Rich Felker complained that compiling Git with [musl libc](https://www.musl-libc.org/) +no longer works out of the box (that is, without setting the `NO_REGEX` +build configuration variable) after commit [2f895225](https://github.com/git/git/commit/2f8952250a84313b74f96abb7b035874854cf202). +The proposed workaround unfortunately didn't work on Windows, as pointed +out by Jeff King and Johannes Schindelin. + +There was a bit of derail about which are main Git platforms, and whether +Git code should be able to rely on POSIX features. Jakub Narębski reminded +that [CodingGuidelines](https://github.com/git/git/blob/master/Documentation/CodingGuidelines#L4) +specifically state that: + +> - Most importantly, we never say "It's in POSIX; we'll happily +> ignore your needs should your system not conform to it." +> We live in the real world. +> +> - However, we often say "Let's stay away from that construct, +> it's not even in POSIX". +> +> - In spite of the above two rules, we sometimes say "Although +> this is not in POSIX, it (is so convenient | makes the code +> much more readable | has other good characteristics) and +> practically all the platforms we care about support it, so +> let's use it". + +The commit in question, making Git require to use regexp engine with +`REG_STARTEND` support, while providing fallback implementation +(turned on with `NO_REGEX`), matches 3rd point in the list above. This +extension to `regexec()`, introduced by the NetBSD project, is present +in all major regex implementation... though not in musl. + +There was yet another proposed fix for the problem, namely adding +padding so that end of mmap-ed file doesn't fall on the page boundary, +if regex implementation doesn't support `REG_STARTEND`. One one hand, +the workaround relied on undocumented (but sane) assumptions about +operating system behavior, on the other hand it was faster than the +workaround in original patch, that is copying contents to NUL-terminated +buffer. Nevertheless, any workaround would mean additional code that +needs to be maintained, and it was not accepted. + +Also, it turned out that `configure` script detects if regex engine +support `REG_STARTEND` and sets `NO_REGEX` if necessary, it was just +badly described. It was [since corrected](https://github.com/git/git/commit/842a516cb02a53cf0291ff67ed6f8517966345c0). + +Though Git doesn't yet set `NO_REGEX` automatically based on information +from `uname`. ### Reviews From f55967bdfa71f35f9cee138332da51318e1bc966 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 19 Oct 2016 12:38:04 +0200 Subject: [PATCH 0173/2664] rn-20: move Jakub's musl article into Support --- rev_news/drafts/edition-20.md | 100 +++++++++++++++++----------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index 74b12ccf4b..a1c0be0d3d 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -17,57 +17,9 @@ This edition covers what happened during the month of September 2016. ## Discussions - + ### Reviews @@ -240,6 +192,54 @@ for ensuring the quality of Git code refactoring. ### Support +* [Regression: git no longer works with musl libc's regex impl](https://public-inbox.org/git/20161004150848.GA7949@brightrain.aerifal.cx/) (*written by Jakub Narębski*) + +Rich Felker complained that compiling Git with [musl libc](https://www.musl-libc.org/) +no longer works out of the box (that is, without setting the `NO_REGEX` +build configuration variable) after commit [2f895225](https://github.com/git/git/commit/2f8952250a84313b74f96abb7b035874854cf202). +The proposed workaround unfortunately didn't work on Windows, as pointed +out by Jeff King and Johannes Schindelin. + +There was a bit of derail about which are main Git platforms, and whether +Git code should be able to rely on POSIX features. Jakub Narębski reminded +that [CodingGuidelines](https://github.com/git/git/blob/master/Documentation/CodingGuidelines#L4) +specifically state that: + +> - Most importantly, we never say "It's in POSIX; we'll happily +> ignore your needs should your system not conform to it." +> We live in the real world. +> +> - However, we often say "Let's stay away from that construct, +> it's not even in POSIX". +> +> - In spite of the above two rules, we sometimes say "Although +> this is not in POSIX, it (is so convenient | makes the code +> much more readable | has other good characteristics) and +> practically all the platforms we care about support it, so +> let's use it". + +The commit in question, making Git require to use regexp engine with +`REG_STARTEND` support, while providing fallback implementation +(turned on with `NO_REGEX`), matches 3rd point in the list above. This +extension to `regexec()`, introduced by the NetBSD project, is present +in all major regex implementation... though not in musl. + +There was yet another proposed fix for the problem, namely adding +padding so that end of mmap-ed file doesn't fall on the page boundary, +if regex implementation doesn't support `REG_STARTEND`. One one hand, +the workaround relied on undocumented (but sane) assumptions about +operating system behavior, on the other hand it was faster than the +workaround in original patch, that is copying contents to NUL-terminated +buffer. Nevertheless, any workaround would mean additional code that +needs to be maintained, and it was not accepted. + +Also, it turned out that `configure` script detects if regex engine +support `REG_STARTEND` and sets `NO_REGEX` if necessary, it was just +badly described. It was [since corrected](https://github.com/git/git/commit/842a516cb02a53cf0291ff67ed6f8517966345c0). + +Though Git doesn't yet set `NO_REGEX` automatically based on information +from `uname`. + * [Why are there multiple ways to get the manual in Git?](https://public-inbox.org/git/CAM_5GX48gDAZSvAWnxO5n8uhYf8vmfAJ88_31_ewsQxyPfF7iA@mail.gmail.com/) Andrew Johnson asked on the mailing list: From 46e36482f5aa9c261f709daba661721b11cabaac Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Wed, 19 Oct 2016 13:12:34 +0200 Subject: [PATCH 0174/2664] rn20: git-log-compact Add description of discussion leading to git-log-compact project (originally proposed as `contrib/git-log-times` script). --- rev_news/drafts/edition-20.md | 36 +++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/rev_news/drafts/edition-20.md b/rev_news/drafts/edition-20.md index a1c0be0d3d..4e0bfb0548 100644 --- a/rev_news/drafts/edition-20.md +++ b/rev_news/drafts/edition-20.md @@ -189,6 +189,42 @@ One can find which regressions were there in the [followup on git mailing list]( It is interesting to find the use of the [Scientist library](https://github.com/github/scientist) for ensuring the quality of Git code refactoring. +* [[PATCH/RFC] git log --oneline alternative with dates, times and initials](https://public-inbox.org/git/git-log-times@mackyle-at-gmail-com/) (*written by Jakub Narębski*) + +Kyle J. McKay had have been wanting a compact one line output format that +included dates, times and initials, and is compatible with `--graph`. + +``` + === 2015-09-17 === +* ee6ad5f4 12:16 jch (tag: v2.5.3) Git 2.5.3 + === 2015-09-09 === +* b9d66899 14:22 js am --skip/--abort: merge HEAD/ORIG_HEAD tree into index +| === 2015-09-04 === +| * 27ea6f85 10:46 jch (tag: v2.5.2) Git 2.5.2 +* 74b67638 10:36 jch (tag: v2.4.9) Git 2.4.9 + .......... +* ecad27cf 10:32 jch (tag: v2.3.9) Git 2.3.9 +``` + +![see above](https://gist.githubusercontent.com/mackyle/4c33e4802a8269b3f200f2c00352ce6a/raw/815de4ef4142e13ac0b5c7b55112afdf13391eee/git-log-times.gif "git log-times --graph --date-order --decorate --no-merges -n 5 v2.5.3") + +To have all this, Kyle proposed `git-log-times` script for `contrib/`. + +Jeff King was surprised to see this as a separate script, and proposed a +[patch series](https://public-inbox.org/git/20160929083315.vwb3aurwbyjwlkjn@sigill.intra.peff.net/) +adding support for features like `--commit-header` option for `git log`, +making it possible to come close to what `git-log-times` provided. + +Junio Hamano [reminded](https://public-inbox.org/git/xmqqy42afvy1.fsf@gitster.mtv.corp.google.com/) +that `contrib/` area is not the place for random git-related things. + +> Unlike the earlier days of Git, if a custom command that uses Git is +> very userful, it can live its own life and flourish within the much +> larger Git userbase we have these days. + +The proposed script was then therefore published as +**[git-log-compact](https://mackyle.github.io/git-log-compact/)** project. + ### Support From 7d2c82dd828daebf939fc79b574eb4c0a191b488 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 19 Oct 2016 15:31:49 +0200 Subject: [PATCH 0175/2664] Publish rn-20 in _posts/ --- .../drafts/edition-20.md => _posts/2016-10-19-edition-20.markdown | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename rev_news/drafts/edition-20.md => _posts/2016-10-19-edition-20.markdown (100%) diff --git a/rev_news/drafts/edition-20.md b/_posts/2016-10-19-edition-20.markdown similarity index 100% rename from rev_news/drafts/edition-20.md rename to _posts/2016-10-19-edition-20.markdown From 6b931cee50dfd5a71b937987c89b0b0cfbc77979 Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 17 Aug 2016 12:30:01 +0200 Subject: [PATCH 0176/2664] Add draft for rn-21 --- rev_news/drafts/edition-21.md | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 rev_news/drafts/edition-21.md diff --git a/rev_news/drafts/edition-21.md b/rev_news/drafts/edition-21.md new file mode 100644 index 0000000000..5e732aa615 --- /dev/null +++ b/rev_news/drafts/edition-21.md @@ -0,0 +1,50 @@ +--- +title: Git Rev News Edition 21 (XXX, 2016) +layout: default +date: 2016-11-09 12:06:51 +0100 +author: chriscool +categories: [news] +navbar: false +--- + +## Git Rev News: Edition 21 (XXX, 2016) + +Welcome to the 21th edition of [Git Rev News](https://git.github.io/rev_news/rev_news/), +a digest of all things Git. For our goals, the archives, the way we work, and how to contribute or to +subscribe, see [the Git Rev News page](https://git.github.io/rev_news/rev_news/) on [git.github.io](http://git.github.io). + +This edition covers what happened during the month of October 2016. + +## Discussions + + + + + + + +## Releases + + +## Other News + +__Various__ + + +__Light reading__ + + +__Git tools and sites__ + + +## Credits + +This edition of Git Rev News was curated by Christian Couder <> +Thomas Ferris Nicolaisen <> and Jakub Narębski <> +with help from XXX. From 585479b27726fd525d3d148e3d5a98a03ed86a5a Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Wed, 19 Oct 2016 16:02:48 +0200 Subject: [PATCH 0177/2664] rn-20: add Dennis among the helpers --- _posts/2016-10-19-edition-20.markdown | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_posts/2016-10-19-edition-20.markdown b/_posts/2016-10-19-edition-20.markdown index 4e0bfb0548..19d0cecb36 100644 --- a/_posts/2016-10-19-edition-20.markdown +++ b/_posts/2016-10-19-edition-20.markdown @@ -435,5 +435,5 @@ __Git tools and sites__ ## Credits This edition of Git Rev News was curated by Christian Couder <> and -Thomas Ferris Nicolaisen <>, with help from Jakub Narębski, Johannes Schindelin, -Lars Schneider and Jeff King. +Thomas Ferris Nicolaisen <>, with help from Jakub Narębski, Dennis Kaarsemaker, +Johannes Schindelin, Lars Schneider and Jeff King. From 2210955881d35e25dc3215b84e9e302cd0a31e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Wed, 19 Oct 2016 16:33:53 +0200 Subject: [PATCH 0178/2664] rn-20: fix mistake in formatting All lines in example output of abbreviated SHA-1 disambiguation should line up --- _posts/2016-10-19-edition-20.markdown | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/_posts/2016-10-19-edition-20.markdown b/_posts/2016-10-19-edition-20.markdown index 19d0cecb36..569f90c3d3 100644 --- a/_posts/2016-10-19-edition-20.markdown +++ b/_posts/2016-10-19-edition-20.markdown @@ -46,12 +46,12 @@ may help the user decide which one they meant. > $ git rev-parse b2e1 > error: short SHA1 b2e1 is ambiguous > hint: The candidates are: -> hint: b2e1196 tag v2.8.0-rc1 -> hint: b2e11d1 tree -> hint: b2e1632 commit 2007-11-14 - Merge branch 'bs/maint-commit-options' -> hint: b2e1759 blob -> hint: b2e18954 blob -> hint: b2e1895c blob +> hint: b2e1196 tag v2.8.0-rc1 +> hint: b2e11d1 tree +> hint: b2e1632 commit 2007-11-14 - Merge branch 'bs/maint-commit-options' +> hint: b2e1759 blob +> hint: b2e18954 blob +> hint: b2e1895c blob The problem of Git providing SHA-1 abbreviation which would soon be invalid was solved in different way than proposed by Linus. Instead From 9057bfd7ca3fbaddccaf2270803312f6cce12c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Nar=C4=99bski?= Date: Wed, 19 Oct 2016 16:41:25 +0200 Subject: [PATCH 0179/2664] rn20: fix formatting of 'dash' in quoted text For some reason '‐' in quoted text is rendered verbatim, rather than as '-'. Fix this by using literal '-'. Note: this issue is not visible in preview. --- _posts/2016-10-19-edition-20.markdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/_posts/2016-10-19-edition-20.markdown b/_posts/2016-10-19-edition-20.markdown index 569f90c3d3..be2fe9d255 100644 --- a/_posts/2016-10-19-edition-20.markdown +++ b/_posts/2016-10-19-edition-20.markdown @@ -283,8 +283,8 @@ Andrew Johnson asked on the mailing list: > While reading Pro Git 2nd Ed. I came across these three methods: > > $ git help <verb>
-> $ git <verb> ‐‐help
-> $ man git‐<verb>
+> $ git <verb> --help
+> $ man git-<verb>
> > I tested all three to confirm they were equivalent. > @@ -295,7 +295,7 @@ Andrew Johnson asked on the mailing list: Fredrik Gustafsson was the first to answer. He first said that the three commands are not actually equivalent on Windows as: -> $ man git‐<verb> +> $ man git-<verb> > > does not work and > From ebf0bacdf451b97b6efa88e7c483f9624344d23d Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Wed, 19 Oct 2016 17:09:08 +0200 Subject: [PATCH 0180/2664] rn-20: Replace '‐' with literal '-' For some reason '‐' character entity is rendered literally (escaped). --- _posts/2016-10-19-edition-20.markdown | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/_posts/2016-10-19-edition-20.markdown b/_posts/2016-10-19-edition-20.markdown index be2fe9d255..7564216113 100644 --- a/_posts/2016-10-19-edition-20.markdown +++ b/_posts/2016-10-19-edition-20.markdown @@ -308,17 +308,17 @@ added at different times for different reasons. The man methods was first added because "historically git was a set of shell scripts named git-*, so each stood alone". -The ‐‐help was the result from "the modern `git ` approach, with -every command normally having ‐h and ‐‐help options for short form +The `--help` was the result from "the modern `git ` approach, with +every command normally having `-h` and `--help` options for short form usage and long form man pages". Meanwhile "a `git help ` command was created" which "allowed selection of display type, so that on -Unix/Linux man was the norm, while an ‐‐html (or ‐‐web) option is +Unix/Linux man was the norm, while an `--html` (or `--web`) option is available for those who like the pretty browser view". Your own Christian Couder chimed in saying that `git help` makes it possible to teach people one command that will do something sensible on every system, and that it also "provides more configurability and -more features like its ‐a and ‐g options". +more features like its -a and -g options". Jakub Narębski added that there are also help pages that are about "concepts (gitcli, gitrevisions, githooks, gitrepository-layout, From f3559b444197b214ea9b51f8afd6edcf35a0e90a Mon Sep 17 00:00:00 2001 From: Christian Couder Date: Sat, 22 Oct 2016 18:50:34 +0200 Subject: [PATCH 0181/2664] SoC-2017-Ideas: replace 2016 with 2017 --- SoC-2017-Ideas.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SoC-2017-Ideas.md b/SoC-2017-Ideas.md index 9521e78e50..7d9aa6103a 100644 --- a/SoC-2017-Ideas.md +++ b/SoC-2017-Ideas.md @@ -93,7 +93,7 @@ discussions.) ## Note about the number of slots -In 2016, the Git organization has very limited mentoring capacity. +In 2017, the Git organization has very limited mentoring capacity. These days we usually accept between 0 and 2 students per year. ## Summer of code main project ideas From 023eaa0a5c2f1a90ff1716ef79a650ecf6190eaf Mon Sep 17 00:00:00 2001 From: Franziska Schmidt Date: Mon, 31 Oct 2016 22:03:40 +0100 Subject: [PATCH 0182/2664] Fix 404 on About in Navbar --- _includes/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/navbar.html b/_includes/navbar.html index b46dab8ce9..f5fb349183 100644 --- a/_includes/navbar.html +++ b/_includes/navbar.html @@ -1,7 +1,7 @@