1.5.3.5 will be out tomorrow

1.5.3.5 will be out tomorrow

[Junio C Hamano]

A fix for a segfaulting bug warrants a new maintenance release,
so 1.5.3.5 will be out tomorrow.

Here is the current shortlog:

Alex Bennee (1):
    Ensure we add directories in the correct order

Alex Riesen (1):
    Fix generation of perl/perl.mak

Andrew Clausen (1):
    helpful error message when send-pack finds no refs in common.

Aurelien Bompard (1):
    honor the http.sslVerify option in shell scripts

Benoit Sigoure (1):
    Fix a small memory leak in builtin-add

Brian Gernhardt (1):
    cvsserver: Use exit 1 instead of die when req_Root fails.

Frank Lichtenheld (1):
    git-config: don't silently ignore options after --list

Gerrit Pape (2):
    git-config: handle --file option with relative pathname properly
    git-config: print error message if the config file cannot be read

Jean-Luc Herren (2):
    git add -i: Fix parsing of abbreviated hunk headers
    git add -i: Remove unused variables

Jeff King (1):
    send-pack: respect '+' on wildcard refspecs

Joakim Tjernlund (1):
    Improve receive-pack error message about funny ref creation

Johannes Schindelin (5):
    clear_commit_marks(): avoid deep recursion
    rebase -i: use diff plumbing instead of porcelain
    Fix setup_git_directory_gently() with relative GIT_DIR &
      GIT_WORK_TREE
    fix filter-branch documentation
    filter-branch: update current branch when rewritten

Julian Phillips (1):
    fast-import: Fix argument order to die in file_change_m

Junio C Hamano (6):
    git-remote: fix "Use of uninitialized value in string ne"
    sha1_file.c: avoid gcc signed overflow warnings
    merge-recursive.c: mrtree in merge() is not used before set
    RelNotes-1.5.3.5: describe recent fixes
    Prevent send-pack from segfaulting (backport from 'master')
    git-merge: document but discourage the historical syntax

Linus Torvalds (6):
    Fix embarrassing "git log --follow" bug
    Clean up "git log" format with DIFF_FORMAT_NO_OUTPUT
    git-blame shouldn't crash if run in an unmerged tree
    Avoid scary errors about tagged trees/blobs during git-fetch
    Fix directory scanner to correctly ignore files without d_type
    Fix diffcore-break total breakage

Mathias Megyei (1):
    Do not remove distributed configure script

Michael W. Olson (1):
    Documentation/git-cvsexportcommit.txt: s/mgs/msg/ in example

Michele Ballabio (2):
    git-reflog: document --verbose
    git-archive: document --exec

Nicolas Pitre (1):
    cherry-pick/revert: more compact user direction message

Patrick Welche (1):
    Define NI_MAXSERV if not defined by operating system

Ralf Wildenhues (1):
    gitk.txt: Fix markup.

Robert Schiele (1):
    fixing output of non-fast-forward output of post-receive-email

Sergei Organov (1):
    core-tutorial: Use new syntax for git-merge.

Shawn O. Pearce (18):
    git-gui: Display message box when we cannot find git in $PATH
    git-gui: Handle starting on mapped shares under Cygwin
    git-gui: Ensure .git/info/exclude is honored in Cygwin workdirs
    git-gui: Allow gitk to be started on Cygwin with native Tcl/Tk
    git-gui: Don't crash when starting gitk from a browser session
    Whip post 1.5.3.4 maintenance series into shape.
    Correct typos in release notes for 1.5.3.5
    Avoid 'expr index' on Mac OS X as it isn't supported
    Document additional 1.5.3.5 fixes in release notes
    Yet more 1.5.3.5 fixes mentioned in release notes
    Avoid invoking diff drivers during git-stash
    Further 1.5.3.5 fixes described in release notes
    Paper bag fix diff invocation in 'git stash show'
    git-gui: Correctly report failures from git-write-tree
    git-gui: Handle progress bars from newer gits
    git-gui: Don't display CR within console windows
    Merge branch 'maint' of git://repo.or.cz/git-gui into maint
    Describe more 1.5.3.5 fixes in release notes

Simon Sasburg (1):
    git-gui: Avoid using bold text in entire gui for some fonts

Steffen Prohaska (2):
    git-gui: accept versions containing text annotations, like
      1.5.3.mingw.1
    attr: fix segfault in gitattributes parsing code

Re: 1.5.3.5 will be out tomorrow

[Linus Torvalds]

On Tue, 30 Oct 2007, Junio C Hamano wrote:
>
> A fix for a segfaulting bug warrants a new maintenance release,
> so 1.5.3.5 will be out tomorrow.

Is the 

	"Make merge-recursive honor diff.renamelimit"

commit in the maintenance series?

If not, I'd suggest merging it.

The lack of this fix bit us during the kernel x86 merge, where there was 
no way for people using stable git versions to make their merges take 
renames into account, because there were too many of them..

It's commit df3a02f6125f7ac82b6e81e3e32cd7ca3c7905ee by Lars Hjemli.

		Linus

Re: 1.5.3.5 will be out tomorrow

[Junio C Hamano]

Linus Torvalds <torvalds@linux-foundation.org> writes:

> On Tue, 30 Oct 2007, Junio C Hamano wrote:
>>
>> A fix for a segfaulting bug warrants a new maintenance release,
>> so 1.5.3.5 will be out tomorrow.
>
> Is the 
>
> 	"Make merge-recursive honor diff.renamelimit"
>
> commit in the maintenance series?
>
> If not, I'd suggest merging it.
>
> The lack of this fix bit us during the kernel x86 merge, where there was 
> no way for people using stable git versions to make their merges take 
> renames into account, because there were too many of them..

Ah, and that is especially painful now the rename limit is quite
low thanks to 0024a54923a12f8c05ce4290f5ebefab0cce4336 (Fix the
rename detection limit checking)?

Will cherry-pick that one -- thanks.