What's in git.git (stable)

I am hoping that we can declare -rc3 and go into a deep freeze after merging Shawn's "describe with accumulated commits since" and Nico's "reflog on HEAD", perhaps by end of the month.

I haven't looked at the finishing touches from Shawn I received tonight yet (it is parked in 'pu'). Nico's "reflog on HEAD" looked good (also parked in 'pu'), but I think it needs to teach the repack/prune/fsck/reflog-expire machinery about reflog entries for HEAD -- otherwise a prune can make reflog useless while your HEAD is detached (which may not be a big deal and while I do not deeply care personally, it would be better to consistently protect them like reflog entries for regular refs).

Although it is tempting to start futzing with prune and ancestry traversal so that commits hidden by grafts are not lost by it, which was brought up today, I think it should be better dealt with after 1.5.0 (it is not a recent regression).

I'd like to take a look at JBF's manual and merge it early -- I fed some small changes to him some time ago but did not have chance to review its recent progress. It deserves attention from wider audience.

* The 'master' branch has these since v1.5.0-rc2.

  Alex Riesen (4):
    Insert ACTIVESTATE_STRING in Git.pm
    Force Activestate Perl to tie git command pipe handle to a handle class
    Cleanup uninitialized value in chomp
    Allow default core.logallrefupdates to be overridden with template's
       config

  Alexandre Julliard (1):
    vc-git.el: Take into account the destination name in vc-checkout.

  Andy Parkins (2):
    New files in git weren't being downloaded during CVS update
    If abbrev is set to zero in git-describe, don't add the unique suffix

  Eric Wong (1):
    git-svn: remove leading slash when printing removed directories

  Jakub Narebski (3):
    Documentation/config.txt: Document config file syntax better
    t/t1300-repo-config.sh: value continued on next line
    Documentation/config.txt: Correct info about subsection name

  Jason Riedy (1):
    Use inttypes.h rather than stdint.h.

  Jeff King (3):
    format-patch: fix bug with --stdout in a subdirectory
    contrib/vim: update syntax for changed commit template
    diffcore-pickaxe: fix infinite loop on zero-length needle

  Johannes Schindelin (2):
    annotate: use pager
    reflog inspection: introduce shortcut "-g"

  Junio C Hamano (25):
    Documentation/tutorial-2: Fix interesting typo in an example.
    Revert "prune: --grace=time"
    Make sure git_connect() always give two file descriptors.
    is_repository_shallow(): prototype fix.
    shallow repository: disable unsupported operations for now.
    git-gc: do not run git-prune by default.
    cvsimport: activate -a option, really.
    .mailmap: fix screw-ups in Uwe's name
    honor --author even with --amend, -C, and -c.
    reflog gc: a tag that does not point at a commit is not a crime.
    git-checkout -m: fix merge case
    git-daemon documentation on enabling services.
    ls-remote and clone: accept --upload-pack=<path> as well.
    Refactor the pack header reading function out of receive-pack.c
    Allow fetch-pack to decide keeping the fetched pack without exploding
    fetch-pack: remove --keep-auto and make it the default.
    Consolidate {receive,fetch}.unpackLimit
    Allow non-developer to clone, checkout and fetch more easily.
    parse-remote: do not barf on a remote shorthand without any refs to fetch.
    show-branch -g: default to HEAD
    Documentation: pack-refs --all vs default behaviour
    Make sure we do not write bogus reflog entries.
    git-merge: leave sensible reflog message when used as the first level UI.
    create_symref: check error return from open().
    write_in_full: size_t is unsigned.

  Linus Torvalds (3):
    fsck-objects: refactor checking for connectivity
    Fix seriously broken "git pack-refs"
    Add dangling objects tips.

  Nicolas Pitre (1):
    fix suggested branch creation command when detaching head

  Peter Eriksen (2):
    sha1_file.c: Avoid multiple calls to find_pack_entry().
    Documentation: --amend cannot be combined with -c/-C/-F.

  Sam Vilain (1):
    contrib/emacs/vc-git.el: support vc-version-other-window

  Shawn O. Pearce (1):
    Remove unnecessary found variable from describe.

  Uwe Kleine-König (2):
    rename --exec to --upload-pack for fetch-pack and peek-remote
    make --upload-pack option to git-fetch configurable

Junio C Hamano wrote:

What about the final version of this doc [DRAFT] Branching and merging with git from http://www.gelato.unsw.edu.au/archives/git/0611/31902.html

-aneesh

On Sat, Jan 27, 2007 at 02:29:15PM +0530, Aneesh Kumar K.V wrote:

I haven't seen anything from him in a while.

If anyone wants to point out material from that document that they found particularly helpful, I'd be happy to help incorporate something similar. But I feel a little uneasy taking large chunks of it without the author's go-ahead.

--b.

"Aneesh Kumar K.V" <aneesh.kumar@gmail.com> writes:

What about it?

The last time I said I was interested in the latest incarnation of it, the response was "will be reposted soon" and we never heard about it after that, I think.

On Sat, Jan 27, 2007 at 12:05:56AM -0800, Junio C Hamano wrote:

That would be great, thanks.

At this point I'm most interested in higher-level questions: Are things in a sensible order? What's the most important material that's not covered? Etc. Not that fixes to the details aren't helpful too, of course.

It still feels really rough, so I'm expecting it to take some time before we'd want to point newbies to it as the place to go for an in-depth git introduction.

--b.

On Saturday, January 27, 2007 at 00:05:56 (-0800) Junio C Hamano writes:

Was there any final decision on allowing pushes through git-daemon?

Bill

Bill Lear <rael@zopyra.com> writes:

Not really. I personally think it is Ok as long as the default stays disabled as Linus posted.