Junio C Hamano <gitster@xxxxxxxxx> writes: > Jeff King <peff@xxxxxxxx> writes: > >> When we serve a fetch, we pass the "wants" and "haves" from >> ... >> This lets us limit the change primarily to the oe_delta() >> and oe_set_delta_ext() functions. And as a bonus, most of >> the rest of the code does not consider these dummy entries >> at all, saving both runtime CPU and code complexity. >> >> Signed-off-by: Jeff King <peff@xxxxxxxx> >> >> Signed-off-by: Jeff King <peff@xxxxxxxx> >> --- > > Sorry for commenting on something completely off-topic, but when > applied with "git am -s", I get a resulting commit with 3 S-o-b (the > above two, plus the one added by "-s"), with a blank line in between > them. I can understand the first blank line (the one between your > two S-o-b), as the first S-o-b does not even appear to be part of > the trailer block, but cannot explain why I get an extra one before > the one added by "-s". Puzzled... I think your original "two s-o-b with a blank line in between" was caused by the same problem, and "git commit --amend -s" perhaps added an extra one at the end, and added a blank line before the last "paragraph" while at it? My suspicion is the long horizontal line at the beginning of the table, triggers it. I haven't followed the code closely yet, though.
