On Fri, 2016-12-02 at 15:42 +1100, Daniel Axtens wrote: > Hi, > > > local hash > > - hash=$(git show -C $1 | python $PWDIR/parser.py --hash) > > + hash=$(git diff "$1~..$1" | python $pwpath/hasher.py)
That's a good point - I don't think the existing code handled merge commits and neither will this... > Does this function appropriately in the presence of merge commits? > ISTR > they had interesting behaviour and there was a difference between > using > ~ and using ^, and I just wanted to flag that for consideration... That's a very good point - I had no idea these did different things but it would appear so: http://stackoverflow.com/a/12527561/613428 I've gone with '~' for now to fix Tom's issue, but I'm going to investigate this over the weekend and submit a follow-up patch if necessary. Stephen _______________________________________________ Patchwork mailing list Patchwork@lists.ozlabs.org https://lists.ozlabs.org/listinfo/patchwork
