Re: What's cooking in git.git (Sep 2017, #06; Fri, 29)

Derrick Stolee [off-list ref] writes:

On 9/29/2017 12:34 AM, Junio C Hamano wrote:

quoted

* ds/find-unique-abbrev-optim (2017-09-19) 4 commits
  - SQUASH???
  - sha1_name: parse less while finding common prefix
  - sha1_name: unroll len loop in find_unique_abbrev_r()
  - sha1_name: create perf test for find_unique_abbrev()

I'll re-roll my patch on Monday if reviews have stabilized. I think I
understand your comments this time (especially around 32-bit ints).

Will look forward to seeing them.

What does "SQUASH???" mean? Is that why there are three meaningful
commits in this note, despite my five-commit patch? Would you like me
to squash the commits in v3?

These are found on 'pu' branch; you can check output from

    git log --oneline --first-parent origin/master..origin/pu

to see where ds/find-unique-abbrev-optim topic was merged, e.g.

    $ git log --oneline --first-parent origin/master..origin/pu | grep ds/fi
    d8c0323166 Merge branch 'ds/find-unique-abbrev-optim' into jch

and you'll find these four commits with:

    $ git log -p origin/master..d8c0323166^2

I knew you had more patches, but I looked at the first three, found
a few glitches that I knew will have to be rerolled, and stopped
looking at the remainder of the series at that point (not because I
felt the topic was helpless, but because I needed to switch my
attention to other topics), so that is why the only three from the
beginning is queued there.  Then I found that with these three, the
tree does not even compile, but I wanted to make sure that 'pu' at
least builds before I push it out, so I created another commit on
top of these three patches as a fix-up to make it compile, so that I
can merge the topic to 'pu'.  This is done in the hope that it would
help contributors more (by showing a small fix that needs to be
squashed into relevant patches when the topic is updated and
re-sent) than plain dropping a topic that does not compile or pass
test on the floor.

So that is what a SQUASH??? commit at the tip of some topics mean.

Thanks.