On Mon, Nov 26, 2012 at 8:45 AM, Brandon Casey <drafnel@xxxxxxxxx> wrote: > From: Brandon Casey <bcasey@xxxxxxxxxx> > > I hate to have the battle of the patches, but I kinda prefer the > append_signoff code in sequencer.c over the code in log-tree.c as a > foundation to build on. > > So, this series is similar to Duy's "unification" series, but it goes in the > opposite direction and builds on top of sequencer.c and additionally adds the > elements from my original series to treat the "(cherry picked from..." line > added by 'cherry-pick -x' in the same way that other footer elements are > treated (after addressing Junio's comments about rfc2822 continuation lines > and duplicate s-o-b's). > > I've integrated Duy's series with a few minor tweaks. I added a couple > of additional tests to t4014 and corrected one of the tests which had > incorrect behavior. I think his sign-off's should still be valid, so I > kept them in. Sorry that I've been slow, and now the two of us are stepping > on each other's toes, but Duy please take a look and let me know if there's > anything you dislike. I'm still not sure whether format-patch should follow cherry-pick's rule in appending sob. If it does, it probably makes more sense to fix the sequencer.c code then delete log-tree.c (not fixes on log-tree.c then delete it). I see that your changes pass all the new tests I added in format-patch so sequencer.c is probably good enough, log-tree.c changes are probably not needed. Feel free take over the series :-) -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html