What's in git.git

The "deathmatch" between Ryan's annotate and Fredrik's blame is officially on. Currently the last test in all three branches fail. Please do not get alarmed.

I'd like asciidoc tweaks in "next" by Francis Daly tested by people who have access to different vintages of docbook-xsl by trying to build manpages. Look for displayed examples, such as the one in git-branch documentation. I've tried it with v1.68 and getting far better results than before, and Francis says v1.69 works fine with or without the change. IOW this is a workaround for a problem in v1.68.

I've been tweaking on-and-off the similarity estimator in the "next" branch. It has become independent from the xdelta code used for pack generation. It may detect more renames that it missed before, and it may miss some other renames and copies. In general, it seems that the algorithm tends to detect slightly more breaks than before. I'd appreciate feedback from people interested in this area.

Another thing I have started in "pu" branch is to stop placing an object we decided to delta that is already max-depth deep back in the delta-base window, because such a thing only wastes the delta base slot. The changed pack-objects does pick up more delta, but the resulting pack seems bigger and I am puzzled why.

This may suggest that our criteria to delta should be tightened a bit (the value of max_size in try_delta should be decreased). We are better off storing a plain deflated representation instad of generating a bad, bigger delta. Insights?

-- -- --

* The 'master' branch has these since the last announcement.

- Documentation fixes (Dmitry V. Levin, Mark Wooding, Martin
  Langhoff, Jeff Muizelaar)

  git/Documentation: fix SYNOPSIS style bugs
  Documentation/Makefile: Some `git-*.txt' files aren't manpages.
  cvsserver: updated documentation
  cosmetics: change from 'See-Also' to 'See Also'
  documentation: add 'see also' sections to git-rm and git-add

- The deathmatch between annotate/blame (Ryan Anderson, Fredrik
  Kuivinen, me cheerleading)

  annotate: Support annotation of files on other revisions.
  git-blame: Make the output human readable
  git-blame: Use the same tests for git-blame as for git-annotate
  blame: avoid -lm by not using log().
  blame and annotate: show localtime with timezone.
  blame: avoid "diff -u0".
  annotate/blame tests updates.
  annotate-blame test: don't "source", but say "."
  annotate-blame test: add evil merge.

- Tweak rev-list (Linus Torvalds)

  get_revision(): do not dig deeper when we know we are at the end.

- Fix git-commit --amend (me)

  git-commit --amend: allow empty commit.

- Misc fixes and cleanups (Mark Wooding and me)

  gitignore: Ignore some more boring things.
  contrib/emacs/Makefile: Provide tool for byte-compiling files.
  Const tightening.

* The 'next' branch, in addition, has these.

- Fix manpage formatting (Francis Daly)

  Tweak asciidoc output to work with broken docbook-xsl

- Tweak break/rename/copy similarity estimator tweaks (me)

  diffcore-rename: similarity estimator fix.
  count-delta: no need for this anymore.
  diffcore-break: similarity estimator fix.
  diffcore-delta: make change counter to byte oriented again.

- Help pack generation tweaks (me)

  verify-pack -v: show delta-chain histogram.

- checkout-index --temp (Shawn Pearce)

  Add --temp and --stage=all options to checkout-index.

* The 'pu' branch, in addition, has these.

- WIP: pack generation tweak (me)

  [WIP] do not waste delta window with objects with already at max-depth.