git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 0/3] Some add-on patches on top of dj/runtime-prefix

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Apr 24, 2018, 14:48 UTC
Message-ID
<nycvar.QRO.7.76.6.1804241646400.64@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
In-Reply-To
<xmqqa7tt72c9.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Tue, 24 Apr 2018, Junio C Hamano wrote:
Show 23 quoted lines
> Junio C Hamano <gitster@pobox.com> writes:
> 
> > Junio C Hamano <gitster@pobox.com> writes:
> >
> >>> base-commit: b46fe60e1d7235603a29499822493bd3791195da
> >>
> >> Basing your work on the tip of 'next' is good for discussion, but
> >> not readily usable for final application.  Let me see if I can
> >> untangle the dependents to come up with a reasonable base.
> >
> > I'll queue this on top of a merge of 'dj/runtime-prefix' into 'master'.
> > Merging the resulting topic into 'next' and applying these patches
> > directly on top of 'next' result in identical trees, of course ;-)
> 
> Actually, these trivially rebase on top of dj/runtime-prefix, so
> I'll queue them like so without taking it hostage to other things in
> 'master'.  We'd want to keep these mergeable to any integration
> branch that dj/runtime-prefix would be merged to, so that is the
> most logical organization, I would think, even though I do not
> immediately see the reason why we would want to merge
> dj/runtime-prefix to 'maint' and lower right now.
> 
> Thanks.

Thank you, and sorry for the trouble. I am just too used to a Continuous Integration setting with exactly one integration branch.

I will make an effort in the future to figure out the best base branch for patches that do not apply cleanly on `master` but require more stuff from `next`/`pu`.

Ciao, Dscho

Previous: Junio C HamanoNext: Junio C Hamano
Message 19 of 21 in “Some add-on patches on top of dj/runtime-prefix”
  1. 0/3 Some add-on patches on top of dj/runtime-prefixJohannes Schindelin, Apr 20, 2018
  2. 1/3 gettext: avoid initialization if the locale dir is not presentJohannes Schindelin, Apr 20, 2018
  3. Ævar Arnfjörð BjarmasonApr 20, 2018
  4. Martin ÅgrenApr 20, 2018
  5. Ævar Arnfjörð BjarmasonApr 20, 2018
  6. Johannes SchindelinApr 20, 2018
  7. Ævar Arnfjörð BjarmasonApr 21, 2018
  8. Johannes SchindelinApr 21, 2018
  9. 2/3 git_setup_gettext: plug memory leakJohannes Schindelin, Apr 20, 2018
  10. 3/3 Avoid multiple PREFIX definitionsJohannes Schindelin, Apr 20, 2018
  11. Philip OakleyApr 22, 2018
  12. 0/3 Some add-on patches on top of dj/runtime-prefixJohannes Schindelin, Apr 21, 2018
  13. 1/3 gettext: avoid initialization if the locale dir is not presentJohannes Schindelin, Apr 21, 2018
  14. 2/3 git_setup_gettext: plug memory leakJohannes Schindelin, Apr 21, 2018
  15. 3/3 Avoid multiple PREFIX definitionsJohannes Schindelin, Apr 21, 2018
  16. Junio C HamanoApr 24, 2018
  17. Junio C HamanoApr 24, 2018
  18. Junio C HamanoApr 24, 2018
  19. Johannes SchindelinApr 24, 2018
  20. Junio C HamanoApr 25, 2018
  21. Johannes SchindelinApr 25, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.