On 7/11/2018 6:42 PM, Jonathan Tan wrote:
This is on _both_ ds/commit-graph-fsck and sb/object-store-lookup,
following Stolee's suggestion.

(It also seems better to build it this way to me, since both these
branches are going into "next" according to the latest What's Cooking.)

Junio wrote in [1]:

I've added SQUASH??? patch at the tip of each of the above,
rebuilt 'pu' with them and pushed the result out.  It seems that
Travis is happier with the result.

Please do not forget to squash them in when/if rerolling.  If there
is no need to change anything else other than squashing them, you
can tell me to which commit in your series the fix needs to be
squashed in (that would save me time to figure it out, obviously).
I'm rerolling because I also need to update the last patch with the new
lookup_commit() function signature that Stefan's sb/object-store-lookup
introduces. I have squashed the SQUASH??? patch into the corresponding
patch in this patch set.

Changes from v2:
  - now also based on sb/object-store-lookup in addition to
    ds/commit-graph-fsck (I rebased ds/commit-graph-fsck onto
    sb-object-store-lookup, then rebased this patch set onto the result)
  - patches 1-5 are unchanged
  - patch 6:
    - used "PRItime" instead of "ul" when printing a timestamp (the
      SQUASH??? patch)
    - updated invocations of lookup_commit() to take a repository object

[1] https://public-inbox.org/git/xmqqpnzt1myi....@gitster-ct.c.googlers.com/

I re-read the patch series and think you addressed all feedback. I have no more to add.

Reviewed-by: Derrick Stolee <dsto...@microsoft.com>

Reply via email to