I am sending this out just as the final minute preview before 1.5.6 final,

hopefully tomorrow night.
* The 'maint' branch has these fixes since the last announcement.
Junio C Hamano (1):

  diff.c: fix emit_line() again not to add extra line
SZEDER Gábor (1):

  diff: reset color before printing newline
* The 'master' branch has these since the last announcement

  in addition to the above.
Alejandro Mery (1):

  git-am: head -1 is obsolete and doesn't work on some new systems
Avery Pennarun (2):

  git-svn: don't append extra newlines at the end of commit messages.

  git-svn: test that extra blank lines aren't inserted in commit messages.
Christian Couder (2):

  documentation: bisect: remove bits talking about a bisection branch

  Documentation: RelNotes-1.5.6: talk about renamed HTML files
Flavio Poletti (1):

  git-instaweb: improve auto-discovery of httpd and call conventions.
Jakub Narebski (2):

  gitweb: Make it work with $GIT containing spaces

  Use 'trash directory' thoroughly in t/test-lib.sh
Johan Herland (3):

  cpio is no longer used by git-clone

  Consistency: Use "libcurl" instead of "cURL library" and "curl"

  The "curl" executable is no longer required
Junio C Hamano (8):

  t4126: fix test that happened to work due to timing

  sha1_file.c: dead code removal

  GIT 1.5.6-rc3

  Makefile: update check-docs target

  Update RPM spec to drop curl executable requirement

  create_tempfile: make sure that leading directories can be accessible by

    peers

  sha1_file.c: simplify parse_pack_index()

  builtin-rerere: fix a small leak
Lea Wiemann (2):

  gitweb: quote commands properly when calling the shell

  gitweb: remove unused parse_ref method
Linus Torvalds (4):

  Avoid cross-directory renames and linking on object creation

  Make loose object file reading more careful

  Simplify and rename find_sha1_file()

  write_loose_object: don't bother trying to read an old object
Mark Levedahl (1):

  git-submodule - Fix errors regarding resolve_re...
[ message continues ]

* The 'maint' branch has now preparing for 1.5.6.1, with these noncritical

  fixes.
Brandon Casey (2):

  git-merge.sh: fix typo in usage message: sucesses --> succeeds

  t7502-commit.sh: test_must_fail doesn't work with inline environment

    variables
Dan McGee (1):

  completion: add --graph to log command completion
Jan Krüger (1):

  Documentation: fix formatting in git-svn
* The 'master' branch has these since the last announcement

  in addition to the above.  Not much to see here (yet).
Cristian Peraferrer (1):

  Print errno upon failure to open the COMMIT_EDITMSG file
Jakub Narebski (1):

  t/README: Add 'Skipping Tests' section below 'Running Tests'
Lea Wiemann (1):

  test-lib.sh: add --long-tests option
Lukas Sandström (1):

  Add a helper script to send patches with Mozilla Thunderbird
Shawn O. Pearce (1):

  Correct documentation for git-push --mirror
Teemu Likonen (2):

  bash: Add more option completions for 'git log'

  Add target "install-html" the the top level Makefile

--

There are a few more fixes destined for maint, being tested in next first.
* The 'maint' branch has these fixes since the last announcement.
Michele Ballabio (1):

  parse-options.c: fix documentation syntax of optional arguments
Stephan Beyer (3):

  api-builtin.txt: update and fix typo

  api-parse-options.txt: Introduce documentation for parse options API

  Extend parse-options test suite
* The 'master' branch has these since the last announcement

  in addition to the above.
Jakub Narebski (2):

  gitweb: Separate filling list of projects info

  gitweb: Separate generating 'sort by' table header
Jeff King (5):

  fix whitespace violations in test scripts

  mask necessary whitespace policy violations in test scripts

  avoid whitespace on empty line in automatic usage message

  avoid trailing whitespace in zero-change diffstat lines

  enable whitespace checking of test scripts
Junio C Hamano (1):

  diff -c/--cc: do not include uninteresting deletion before leading

    context
Karl Hasselström (2):

  Clean up builtin-update-ref's option parsing

  Make old sha1 optional with git update-ref -d
Linus Torvalds (3):

  racy-git: an empty blob has a fixed object name

  Make git_dir a path relative to work_tree in setup_work_tree()

  Shrink the git binary a bit by avoiding unnecessary inline functions
Marius Storm-Olsen (3):

  Add an optional <mode> argument to commit/status -u|--untracked-files

    option

  Add argument 'no' commit/status option -u|--untracked-files

  Add configuration option for default untracked files mode
Nanako Shiraishi (2):

  environment.c: remove unused function

  config.c: make git_env_bool() static
Pieter de Bie (1):

  builtin-fast-export: Add importing and exporting of revision marks
Rafael Garcia-Suarez (1):

  gitweb: remove git_blame and rename git_blame2 to git_blame
René Scharfe (1):

  Teach new attribute 'export-ignore' to git-archive
--

We'd need a maint release soon to push out the mkstemp() breakage but not

tonight.  There are a handful changes that are in 'master' and 'next' that

need backport/backmerge before 1.5.6.1 happens.
* The 'maint' branch has these fixes since the last announcement.
Jan Krüger (1):

  git-svn: make rebuild respect rewriteRoot option
Patrick Higgins (1):

  Workaround for AIX mkstemp()
* The 'master' branch has these since the last announcement

  in addition to the above.
Jeff King (1):

  clone: create intermediate directories of destination repo
Junio C Hamano (2):

  pre-rebase hook update

  Ship sample hooks with .sample suffix
Michele Ballabio (1):

  t9301-fast-export.sh: Remove debug line
Nicolas Pitre (8):

  call init_pack_revindex() lazily

  implement some resilience against pack corruptions

  test case for pack resilience against corruptions

  refactor pack structure allocation

  optimize verify-pack a bit

  move show_pack_info() where it belongs

  verify-pack: check packed object CRC when using index version 2

  verify-pack: test for detection of index v2 object CRC mismatch
--

There are a few fixes on 'maint', in addition to futureproofing of "git

shell" so that eventually we can update the ssh clients to ask for server

side programs using "git upload-pack" syntax without a dash between "git"

and the subcommand name.
Many of the medimu size items for 1.6.0 have been merged to 'master'.  The

port to MinGW series will also be merged shortly.
----------------------------------------------------------------
GIT v1.6.0 Release Notes (draft)

================================
User visible changes

--------------------
With the default Makefile settings, most of the programs are now

installed outside your $PATH, except for "git", "gitk", "git-gui" and

some server side programs that need to be accessible for technical

reasons.  Invoking a git subcommand as "git-xyzzy" from the command

line has been deprecated since early 2006 (and officially announced in

1.5.4 release notes); use of them from your scripts after adding

output from "git --exec-path" to the $PATH is still supported in this

release, but users are again strongly encouraged to adjust their

scripts to use "git xyzzy" form, as we will stop installing

"git-xyzzy" hardlinks for built-in commands in later releases.
Source changes needed for porting to MinGW environment are now all in the

main git.git codebase.
By default, packfiles created with this version uses delta-base-offset

encoding introduced in v1.4.4.  Pack idx files are using version 2 that

allows larger packs and added robustness thanks to its CRC checking,

introduced in v1.5.2.
Updates since v1.5.6

--------------------
(subsystems)
* git-p4 in contrib learned "allowSubmit" configuration to control on

  which branch to allow "submit" subcommand.
(portability)
* Sample hook scripts shipped in templates/ are now suffixed with

  *.sample.  We used to prevent them from triggering by default by

  relying on the fact that we install them as unexecutable, but on

  some filesystems this approach does not work.  Instead of runn...
[ message continues ]

I sent out a code cleanup for remote.c yesterday that fixes a segfault:
  http://mid.gmane.org/20080616161502.GA7219@sigill.intra.peff.net
I am OK if it doesn't make it in to 1.5.6, but if not, then we should at

least apply the very safe one-liner that prevents the segfault. That

patch is below.
-- >8 --

fix segfault with "git push bogus:bogus"
We try to guess the type of the dst half of the refspec

based on the src half. If the src half is bogus, we ended up

dereferencing NULL.

---

 remote.c |    3 ++-

 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/remote.c b/remote.c

index 91e3b11..fd8c71a 100644

--- a/remote.c

+++ b/remote.c

@@ -920,7 +920,8 @@ static int match_explicit(struct ref *src, struct ref *dst,

 	case 0:

 		if (!memcmp(dst_value, "refs/", 5))

 			matched_dst = make_linked_ref(dst_value, dst_tail);

-		else if((dst_guess = guess_ref(dst_value, matched_src)))

+		else if(matched_src &&

+			(dst_guess = guess_ref(dst_value, matched_src)))

 			matched_dst = make_linked_ref(dst_guess, dst_tail);

 		else

 			error("unable to push to unqualified destination: %s\n"

--

1.5.6.rc3.160.g2a3c9
--