Re: What's cooking in git.git (Apr 2019, #01; Thu, 4)

["Ævar Arnfjörð Bjarmason" <avarab@gmail.com>]

On Thu, Apr 04 2019, Junio C Hamano wrote:

> * dl/rebase-i-keep-base (2019-04-03) 4 commits
>  - rebase: teach rebase --keep-base
>  - rebase: fast-forward --onto in more cases
>  - t3432: test rebase fast-forward behavior
>  - t3431: add rebase --fork-point tests
>
>  "git rebase --keep-base <upstream>" tries to find the original base
>  of the topic being rebased and rebase on top of that same base, which
>  is useful when running the "git rebase -i" (and its limited variant
>  "git rebase -x").
>
>  Will merge to 'next'.

Still a bit unclear on whether parts of this are intended or just
emergent behavior, as noted in
https://public-inbox.org/git/87ftquapfy.fsf@evledraar.gmail.com/

> * jh/trace2-sid-fix (2019-04-01) 7 commits
>  - trace2: make SIDs more unique
>  - trace2: clarify UTC datetime formatting
>  - trace2: report peak memory usage of the process
>  - trace2: use system config for default trace2 settings
>  - trace2: find exec-dir before trace2 initialization
>  - trace2: add absolute elapsed time to start event
>  - trace2: refactor setting process starting time
>
>  Polishing of the new trace2 facility continues.  The system-level
>  configuration can specify site-wide trace2 settings (which would be
>  loved by big-brother types ;-).
>
>  Getting closer but still being discussed.
>  cf. <20190403000032.GA190454@google.com>

FWIW also the discussion as of https://public-inbox.org/git/87lg0x9voz.fsf@evledraar.gmail.com/

> * js/trace2-to-directory (2019-03-22) 1 commit
>  - trace2: write to directory targets
>
>  The trace2 tracing facility learned to auto-generate a filename
>  when told to log to a directory.
>
>  Will merge to 'next'.

I had the feedback of effectively "why retry if we can just make the SID
unique enough" in
https://public-inbox.org/git/874l7rcqk9.fsf@evledraar.gmail.com/ on
March 25th.

You seemed to think so, but after Jeff Hostetler made the SID more
unique (AFAICT "actually unique" in practice) in the parallel in-flight
jh/trace2-sid-fix
(https://public-inbox.org/git/4352952677a11776a18ec9b6862cf358307cfafd.1553879063.git.gitgitgadget@gmail.com/)

I think it's fine to merge js/trace2-to-directory down as it is, but do
you/Josh think that retry logic needs to stay with that sort of SID?