Andrea, I agree. This is the merge I examined after noticing your GitHub comment. Now I realise looking again that the merge is not fully squashed. The structure looks the same as a normal merge, but with different commit message. I do not understand why this would be considered a squashed commit.
I used "git log --format=fuller" to see both committer and author, and gitk which also displays this information (and raw parent commit ids). Kind regards, Ben. On 01/09/16 19:00, Andrea Aime wrote: > On Thu, Sep 1, 2016 at 12:20 AM, Ben Caradoc-Davies <[email protected]> > wrote: > >> Attribution is a moral right distinct from copyright. We have an >> obligation to attribute the work of individuals, even when their >> copyright has been assigned, and even when their commits are messy. >> > > Totally agree. > > However I was looking at the history locally and something is different. I > did squash-merge > Devon's sun coding conventions fix, and looking at github commit it appears > to be my work: > > https://github.com/geotools/geotools/commit/223b1a7658b1dab7de6145c26ad87582996c167c > > Yet doing a blame on the files locally locally, the changes are attributed > to Devon, and so they do online: > https://github.com/geotools/geotools/blame/master/docs/developer/conventions/code/style.rst#L13 > > Check the sha1, it's pointing to Devon's commit, not my squash-merge one > > Also doing a shortlog locally the attribution is given to Devon: > > git shortlog . --since "one week ago" > Devon Tucker (2): > [GEOT-5284] Fixed the Sun coding conventions link. Update the > documentation with some IntelliJ information. Removed the Examples profile > from the formatter.xml > Added a bit more inline style to be consistent > > Long story short, it seems attribution is preserved, I'm just not sure how. > The gitk tree seems to show a merge (but then again, if this is the case, > what is the squash commit > good for... the two separate Devon's commits are still showing up in the > history): > > [image: Inline image 1] > > Cheers > Andrea > > -- Ben Caradoc-Davies <[email protected]> Director Transient Software Limited <http://transient.nz/> New Zealand ------------------------------------------------------------------------------ _______________________________________________ GeoTools-Devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/geotools-devel
