From: Elijah Newren <newren@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: batolettre@gmail.com, "Git Mailing List" <git@vger.kernel.org>,
"Ævar Arnfjörð" <avarab@gmail.com>
Subject: Re: git-bug: Distributed bug tracker embedded in git
Date: Sat, 18 Aug 2018 19:06:16 -0700 [thread overview]
Message-ID: <CABPp-BE+zfWOqQQoO0mvJPefODW3fDsfYuC6OzBzSD5fe1xarg@mail.gmail.com> (raw)
In-Reply-To: <20180818225052.GE144170@aiede.svl.corp.google.com>
On Sat, Aug 18, 2018 at 3:50 PM Jonathan Nieder <jrnieder@gmail.com> wrote:
> (cc-ing Elijah Newren for the points about merging)
> [...]
> > Git doesn't provide a low-level command to rebase a branch onto
> > another without touching the index.
>
> Thanks for pointing this out. There's been some recent work to make
> Git's merge code (also used for cherry-pick) less reliant on the index
> and worktree. See https://crbug.com/git/12 for some references.
> There's also been some heavy refactoring of "git rebase" code to be in
> C and be able to make use of library functions instead of being a
> shell script.
>
> That's all to say that we're in a pretty good place to consider
> introducing commands like
>
> git cherry-pick --onto=<branch> <revisions>
Yes, indeed, after the merge refactoring/rewriting stuff is complete,
this is one thing already on my list that I wanted to do with it.
Another thing I'd like to investigate with it is how much "in-memory"
merges could speed up interactive rebases, as suggested by Dscho[1].
Once we do "in-memory" merges for interactive rebases for performance
reasons, we're pretty close to having a
rebase-without-touching-index-or-worktree that we can make accessible
to other scripts like git-bug. However, we have to have a pretty good
answer about what to do when we hit conflicts.
[1] https://public-inbox.org/git/nycvar.QRO.7.76.6.1806100006000.77@tvgsbejvaqbjf.bet/
prev parent reply other threads:[~2018-08-19 2:06 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-17 22:06 git-bug: Distributed bug tracker embedded in git Michael Muré
2018-08-17 23:20 ` Tacitus Aedifex
2018-08-18 5:43 ` Jonathan Nieder
2018-08-18 12:24 ` Ævar Arnfjörð Bjarmason
2018-08-18 20:42 ` Jonathan Nieder
2018-08-18 21:53 ` Ævar Arnfjörð Bjarmason
2018-08-18 22:08 ` Jonathan Nieder
2018-08-18 22:19 ` Ævar Arnfjörð Bjarmason
2018-08-18 22:26 ` Jonathan Nieder
2018-08-19 21:08 ` Jeff King
2018-08-18 16:21 ` Junio C Hamano
2018-08-19 1:27 ` Jonathan Nieder
2018-08-19 4:00 ` Kyle Meyer
2018-08-19 5:01 ` Jonathan Nieder
2018-08-18 22:50 ` Jonathan Nieder
2018-08-19 0:45 ` Michael Muré
2018-08-19 1:14 ` Michael Muré
2018-08-19 2:06 ` Elijah Newren [this message]
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=CABPp-BE+zfWOqQQoO0mvJPefODW3fDsfYuC6OzBzSD5fe1xarg@mail.gmail.com \
--to=newren@gmail.com \
--cc=avarab@gmail.com \
--cc=batolettre@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.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).