[offlist] Re: [SCM] Samba Shared Repository - branch v3-6-test updated

[simo]

On Mon, 2010-12-13 at 23:25 -0500, simo wrote:
> On Mon, 2010-12-13 at 19:21 -0800, Jeremy Allison wrote:
> > On Tue, Dec 14, 2010 at 04:20:48AM +0100, Jeremy Allison wrote:
> > > The branch, v3-6-test has been updated
> > >        via  274fc73 Ensure we use vfs_fsp_stat(), not VFS_STAT directly, and store into fsp->fsp_name->st instead of a SMB_STRUCT_STAT on the stack.
> > >        via  2ff6822 Merge branch 'v3-6-test' of ssh://git.samba.org/data/git/samba into v3-6-test
> > >        via  dc38715 smbtorture: correct error handling in BASE-OPEN.
> > >       from  1ef50b1 Change crediting so that the credits are returned on the interim async response. (cherry picked from commit 58ebe1de32050fca71059c521f74488cfa5b3729)
> > > 
> > > http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
> > > 
> > > 
> > > - Log -----------------------------------------------------------------
> > > commit 274fc732d751429c7a6ce9d4257b3bde68ffa8cd
> > > Author: Jeremy Allison <jra at samba.org>
> > > Date:   Mon Dec 13 19:17:57 2010 -0800
> > > 
> > >     Ensure we use vfs_fsp_stat(), not VFS_STAT directly, and store into fsp->fsp_name->st
> > >     instead of a SMB_STRUCT_STAT on the stack.
> > >     
> > >     Jeremy.
> > >     (cherry picked from commit 68f8f220dcd20f4f04bc95916ae04da81a2cdda1)
> > > 
> > > commit 2ff682226bed8ac1f55caee4aaa7cc1e8c0d1a47
> > > Merge: dc38715527d282545ba7b05051bda70067fe5d6a 1ef50b15da1ca23afc2d3af6abe7f375e57946a1
> > > Author: Jeremy Allison <jra at samba.org>
> > > Date:   Mon Dec 13 17:08:08 2010 -0800
> > > 
> > >     Merge branch 'v3-6-test' of ssh://git.samba.org/data/git/samba into v3-6-test
> > 
> > Arg. Sorry for the bloody merge commit. Didn't see that
> > one happen :-(.
> 
> If you want to avoid merges you can use this alias that I use all the
> time:
> 
> alias git-get='git fetch origin master && git rebase -i origin/master'
> 
> Use git-get instead of git pull
> 
> It will always cause an interactive rebase, but I find it the best way
> to avoid really annoying merges all over.

Heh so much for the [offlist] tag ...

/simo intoxicated by a lot of delicious wine ... :-)

-- 
Simo Sorce
Samba Team GPL Compliance Officer <simo at samba.org>
Principal Software Engineer at Red Hat, Inc. <simo at redhat.com>