poor git style in ACL patches

simo idra at samba.org
Thu May 17 07:08:48 MDT 2012


On Thu, 2012-05-17 at 16:36 +1000, Andrew Bartlett wrote: 
> On Wed, 2012-05-16 at 22:00 -0700, Jeremy Allison wrote:
> > On Thu, May 17, 2012 at 12:55:59AM -0400, simo wrote:
> > > On Thu, 2012-05-17 at 05:09 +0200, Andrew Bartlett wrote:
> > > > commit 367a644c4d91531faf8b2ce9a167fc196da12422
> > > > Author: Andrew Bartlett <abartlet at samba.org>
> > > > Date:   Mon May 14 17:11:09 2012 -0700
> > > > 
> > > >     We need to split things up into a new helper function
> > > > add_current_ace_to_acl() in order for there to be more posix ACL
> > > > elements than NT ACL elements (so a group SID can own a file, but also
> > > > get the group permissions that will be honoured)
> > > 
> > > Andrew,
> > > it would be really appreciate if you could stick to git standard of
> > > providing a short 'subject' in the first line, then leave one empty, and
> > > then put the commit message wrapped to 72 chars.
> > > 
> > > This is also the standard used in the kernel and makes logs a lot more
> > > readable (also in gitk).
> > 
> > This one might be my fault, as I hand-patched some of
> > Andrews changes, made the edits I wanted and then commited
> > them under his identity with my sign-off (as they were 99.999%
> > his changes).
> > 
> > I may have missed the first line of his original commit
> > message when doing the commit, so this might be my error
> > in the review.
> 
> Using git rebase -i and git commit --amend is a good way to keep the
> original commit detail intact, while making small changes.

Even better, use git commit --fixup <id> to apply changes to a specific
commit, then do a normal git rebase and they will be automatically
merged w/o any need to edit the message.

Also if you really blowed away the patch and are re-committing
everything from scratch use -c <id> to keep the original commit id
comment (add -s for the signoff if you want although we should use
acked-by: not sign-off: IMHO)

If you are not using git tools but using patch/diff and committing from
scratch every time you need someone to whip you in the back and teach
you some git foo, you are wasting valuable time.
I am looking at you Jeremy :-D

Simo.

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



More information about the samba-technical mailing list