Cycle 1.7.6, day #5 of week #1

Reviewed and commented on 10 topics.

Sent 4 patches for review.

Queued 25 patches from 9 people.
Merged 3 topics to 'next' branch for public testing.
Merged 1 topic to 'maint' branch, to include in the maintenance release.

Cycle 1.7.6, day #4 of week #1

Reviewed and commented on 5 topics.

Keep ignoring the "package manager" discussion thread, which I am not personally interested in, and I do not want to see our core people waste their time on.  I am however interested in adding some sort of plug-in that the users can pick and choose and even override the native subcommands (e.g. "git merge") in a controlled way, but the discussion seems to be going in a totally irrelevant direction.

Queued 29 patches from 9 people.
Merged 6 topics to 'master' branch, to include in the next release.
Merged 8 topics to 'next' branch for public testing.

Cycle 1.7.6, day #3 of week #1

Reviewed and commented on 11 topics.
Queued 14 patches from 6 contributors.
Merged 17 topics to 'master' branch, to include in the next release.
Merged 1 topic to 'next' branch for public testing.

Cycle 1.7.6, day #2 of week #1

Reviewed and Commented on 10 topics.
Queued 9 new patches from 7 contributors.
Merged 12 topics for public testing on 'next' branch.

Cycle 1.7.6, day #1 of week #1

Created a calendar to keep track of the progress of 1.7.6 cycle. If you happen to use Google Calendar, you can paste:

jfgbl2mrlipp4pb6ieih0qr3so@group.calendar.google.com

in the "Other calendars" box (where a gray "Add a friend's calendar" appears), but you won't be missing much even if you don't (I only have week numbers and the target tagging dates, nothing more interesting than that). The plan for 1.7.6 cycle can also be seen at Post 1.7.5 plans.

Updated the "Note from the Maintainer". Unlike the previous updates, rewrote many parts of it to shorten the document, and added the "Reporting bugs" section.

Discussed CURLOPT_POSTFIELDS gotcha with Shawn, and sent out one patch to the list for review.

Reviewed and commented on 13 topics.

After giving them another review, merged 30 topics for public testing on 'next'; the majority of the topics are what have been already cooking during the feature freeze period at the end of the previous cycle.

A Note from the Maintainer

Welcome to git development community.

This message is written by the maintainer and talks about how Git
project is managed, and how you can work with it.

Mailing list and the community

The development is primarily done on the Git mailing list. Help
requests, feature proposals, bug reports and patches should be sent to
the list address . You don't have to be
subscribed to send messages. The convention on the list is to keep
everybody involved on Cc:, so it is unnecessary to ask "Please Cc: me,
I am not subscribed".

Before sending patches, please read Documentation/SubmittingPatches
and Documentation/CodingGuidelines to familiarize yourself with the
project convention.

If you sent a patch and you did not hear any response from anybody for
several days, it could be that your patch was totally uninteresting,
but it also is possible that it was simply lost in the noise. Please
do not hesitate to send a reminder message in such a case. Messages
getting lost in the noise is a sign that people involved don't have
enough mental/time bandwidth to process them right at the moment, and
it often helps to wait until the list traffic becomes calmer before
sending such a reminder.

The list archive is available at a few public sites as well:

http://news.gmane.org/gmane.comp.version-control.git/

http://marc.theaimsgroup.com/?l=git

http://www.spinics.net/lists/git/

and some people seem to prefer to read it over NNTP:

nntp://news.gmane.org/gmane.comp.version-control.git

When you point at a message in a mailing list archive, using
gmane is often the easiest to follow by readers, like this:

http://thread.gmane.org/gmane.comp.version-control.git/27/focus=217

as it also allows people who subscribe to the mailing list as gmane
newsgroup to "jump to" the article.

Some members of the development community can sometimes also be found
on the #git IRC channel on Freenode. Its log is available at:

http://colabti.org/irclogger/irclogger_log/git

Reporting bugs

When you think git does not behave as you expect, please do not stop your
bug report with just "git does not work". "I tried to do X but it did not
work" is not much better, neither is "I tried to do X and git did Y, which
is broken". It often is that what you expect is _not_ what other people
expect, and chances are that what you expect is very different from what
people who have worked on git have expected (otherwise, the behavior
would have been changed to match that expectation long time ago).

Please remember to always state

• what you wanted to do;
• what you did (the version of git and the command sequence to reproduce
  the behavior);
• what you saw happen;
• what you expected to see; and
• how the last two are different.

See http://www.chiark.greenend.org.uk/~sgtatham/bugs.html for further
hints.

Repositories, branches and documentation.

My public git.git repository is at:

git://git.kernel.org/pub/scm/git/git.git/

Immediately after I publish to the primary repository at kernel.org, I
also push into an alternate here:

git://repo.or.cz/alt-git.git/

Impatient people might have better luck with the latter one (there are a
few other mirrors I push into at sourceforge and github as well).

Their gitweb interfaces are found at:

http://git.kernel.org/?p=git/git.git

http://repo.or.cz/w/alt-git.git

There are three branches in git.git repository that are not about the
source tree of git: "html", "man", and "todo".

The "html" and "man" are auto-generated documentation from the tip of
the "master" branch; the tip of "html" is extracted to be visible at
kernel.org at:

http://www.kernel.org/pub/software/scm/git/docs/

The above URL is the top-level documentation page, and it has links to
documentation of older releases.

The "todo" branch was originally meant to contain a TODO list for me,
but is mostly used to keep some helper scripts I use to maintain git.
For example, the script to maintain the two documentation branches are
found there as dodoc.sh, which may be a good demonstration of how to
use a post-update hook to automate a task after pushing into a
repository.

There are four branches in git.git repository that track the source tree
of git: "master", "maint", "next", and "pu".

The "master" branch is meant to contain what are very well tested and
ready to be used in a production setting. Every now and then, a "feature
release" is cut from the tip of this branch and they typically are named
with three dotted decimal digits. The last such release was 1.7.5 done on
Apr 24, 2011. You can expect that the tip of the "master" branch is
always more stable than any of the released versions.

Whenever a feature release is made, "maint" branch is forked off from
"master" at that point. Obvious, safe and urgent fixes after a feature
release are applied to this branch and maintenance releases are cut from
it. The maintenance releases are named with four dotted decimal, named
after the feature release they are updates to; the last such release was
1.7.4.5. New features never go to this branch. This branch is also
merged into "master" to propagate the fixes forward.

A new development does not usually happen on "master". When you send a
series of patches, after review on the mailing list, a separate topic
branch is forked from the tip of "master" and your patches are queued
there, and kept out of "master" while people test it out. The quality of
topic branches are judged primarily by the mailing list discussions.

Topic branches that are in good shape are merged to the "next" branch. In
general, the "next" branch always contains the tip of "master". It might
not be quite rock-solid production ready, but is expected to work more or
less without major breakage. The "next" branch is where new and exciting
things take place. A topic that is in "next" is expected to be polished to
perfection before it is merged to "master" (that's why "master" can be
expected to stay more stable than any released version).

The "pu" (proposed updates) branch bundles all the remaining topic
branches. The topics on the branch are not complete, well tested, nor well
documented and need further work. When a topic that was in "pu" proves to
be in testable shape, it is merged to "next".

You can run "git log --first-parent master..pu" to see what topics are
currently in flight. Sometimes, an idea that looked promising turns out
to be not so good and the topic can be dropped from "pu" in such a case.

The two branches "master" and "maint" are never rewound, and "next"
usually will not be either. After a feature release is made from
"master", however, "next" will be rebuilt from the tip of "master"
using the topics that didn't make the cut in the feature release.

Note that being in "next" is not a guarantee to appear in the next
release, nor even in any future release. There were cases that topics
needed reverting a few commits in them before graduating to "master", or a
topic that already was in "next" was reverted from "next" because fatal
flaws were found in it after it was merged.

Other people's trees, trusted lieutenants and credits.

Documentation/SubmittingPatches outlines to whom your proposed changes
should be sent. As described in contrib/README, I would delegate fixes
and enhancements in contrib/ area to the primary contributors of them.

Although the following are included in git.git repository, they have their
own authoritative repository and maintainers:

• git-gui/ comes from git-gui project, maintained by Pat Thoyts:

git://repo.or.cz/git-gui.git

• gitk-git/ comes from Paul Mackerras's gitk project:

git://git.kernel.org/pub/scm/gitk/gitk.git

I would like to thank everybody who helped to raise git into the current
shape. Especially I would like to thank the git list regulars whose help
I have relied on and expect to continue relying on heavily:

• Linus Torvalds, Shawn Pearce, Johannes Schindelin, Nicolas Pitre,
  René Scharfe, Jeff King, Jonathan Nieder, Johan Herland, Johannes
  Sixt, Sverre Rabbelier, Michael J Gruber, Nguyễn Thái Ngọc Duy,
  Ævar Arnfjörð Bjarmason and Thomas Rast on general design and
  implementation issues and reviews on the mailing list.
• Shawn and Nicolas Pitre on pack issues.
• Martin Langhoff, Frank Lichtenheld and Ævar Arnfjörð Bjarmason on
  cvsserver and cvsimport.
• Paul Mackerras on gitk.
• Eric Wong, David D. Kilzer and Sam Vilain on git-svn.
• Simon Hausmann and Pete Wyckoff on git-p4.
• Jakub Narebski, John Hawley, Petr Baudis, Luben Tuikov, Giuseppe Bilotta on
  gitweb.
• J. Bruce Fields, Jonathan Nieder, Michael J Gruber and Thomas Rast on
  documentation (and countless others for proofreading and fixing).
• Alexandre Julliard on Emacs integration.
• David Aguilar and Charles Bailey for taking good care of git-mergetool
  (and Theodore Ts'o for creating it in the first place) and git-difftool.
• Johannes Schindelin, Johannes Sixt, Erik Faye-Lund and others for their
  effort to move things forward on the Windows front.
• People on non-Linux platforms for keeping their eyes on portability;
  especially, Randal Schwartz, Theodore Ts'o, Jason Riedy, Thomas Glanzmann,
  Brandon Casey, Jeff King, Alex Riesen and countless others.

This document

The latest copy of this document is found in git.git repository,
on 'todo' branch, as MaintNotes.

Git 1.7.5

The cycle took a bit longer than I would have liked (83 days), but finally I tagged the latest release v1.7.5 with 547 changes from 77 contributors. The previous release v1.7.4 had 554 changes from 104 contributors and it took 134 days.

Changes are very well balanced: 20% in implementation, 20% in tests, 15% in documentation. There is nothing particularly earth-shattering but the foundation for i18n is now laid out which is internally a big thing. We also had a large update to git-gui's po files (pt_br).

On the development branch a handful of interesting and rule changing features have already been cooking. Hopefully the next cycle will be even shorter.