On 1/24/2019 6:39 PM, Junio C Hamano wrote: > "Derrick Stolee via GitGitGadget" <[email protected]> writes: > >> This series is based on ab/commit-graph-write-progress and bc/sha-256. > > Thanks. > > It seems that the base (i.e. merge between these two topics) you > used may have used a version of either topic (most likely the > latter) slightly older than what I have, as patches 1 and 2 seem to > lack the local variable "hashsz" in the context, near the beginning > of commit_graph_write(). I wiggled the patches in, but it has too > heavy conflict merging to 'pu', so it may have to wait until the > other topics stabilize a bit further.
Sorry that the merge was painful. I would have waited longer for things to stabilize, but I'm expecting to go on paternity leave soon. Didn't want to get the idea out there before I disappear for a while. When things stabilize, I may have time to do a rebase and work out the details myself. Otherwise, everyone has my blessing to take work I've started and move it forward themselves. Thanks, -Stolee
