From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Denton Liu <liu.denton@gmail.com>,
Josh Steadmon <steadmon@google.com>,
Jeff Hostetler <git@jeffhostetler.com>
Subject: Re: What's cooking in git.git (Apr 2019, #01; Thu, 4)
Date: Sat, 06 Apr 2019 21:57:48 +0200 [thread overview]
Message-ID: <87ef6eaoub.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <xmqqr2aidpxw.fsf@gitster-ct.c.googlers.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?
next prev parent reply other threads:[~2019-04-06 19:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-04 10:28 What's cooking in git.git (Apr 2019, #01; Thu, 4) Junio C Hamano
2019-04-04 11:08 ` Duy Nguyen
2019-04-04 21:29 ` Junio C Hamano
2019-04-06 20:28 ` Ævar Arnfjörð Bjarmason
2019-04-08 4:14 ` Junio C Hamano
2019-04-09 10:26 ` [PATCH] Introduce "precious" file concept Nguyễn Thái Ngọc Duy
2019-04-09 11:31 ` Junio C Hamano
2019-04-10 9:36 ` Duy Nguyen
2019-04-12 1:28 ` Junio C Hamano
2019-04-09 17:44 ` Eric Sunshine
2019-04-12 21:54 ` Ævar Arnfjörð Bjarmason
2019-04-13 10:19 ` Duy Nguyen
2019-04-05 1:05 ` What's cooking in git.git (Apr 2019, #01; Thu, 4) Todd Zullinger
2019-04-05 5:41 ` Junio C Hamano
2019-04-06 19:28 ` Ævar Arnfjörð Bjarmason
2019-04-08 4:18 ` Junio C Hamano
2019-04-06 19:57 ` Ævar Arnfjörð Bjarmason [this message]
2019-04-08 4:28 ` Junio C Hamano
2019-04-08 21:18 ` Josh Steadmon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ef6eaoub.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=git@jeffhostetler.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
--cc=steadmon@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).