From: Thomas Gummerer <t.gummerer@gmail.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: "Christian Couder" <christian.couder@gmail.com>,
git <git@vger.kernel.org>, "Jeff King" <peff@peff.net>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Оля Тележная" <olyatelezhnaya@gmail.com>,
"Matthieu Moy" <Matthieu.Moy@gmail.com>
Subject: Re: GSoC 2019: Git's application submitted
Date: Thu, 7 Feb 2019 21:33:26 +0000 [thread overview]
Message-ID: <20190207213326.GF6085@hank.intra.tgummerer.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1902072023250.41@tvgsbejvaqbjf.bet>
On 02/07, Johannes Schindelin wrote:
> Hi Thomas,
>
> On Wed, 6 Feb 2019, Thomas Gummerer wrote:
> > - implement pushing the index state, without dealing with conflicts
> > - implement poping the index state, without dealing with conflicts
> >
> > This can already be individually useful, and I think this is
> > something people asked for on the mailing list, though I didn't try
> > digging up old threads for now. After these two steps stashing and
> > restoring a merge conflict would still not work, but we have a good
> > first step that could be merged.
>
> We already have `git stash --keep-index`. Is this what you mean here?
`git stash --keep-index` does something different, what I meant here
was what `git stash pop --index` already does. I had forgotten that
this functionality already exists.
> > - implement pushing/poping conflicted state
> >
> > This would obviously be the end goal.
>
> On second thought, this might actually be super trivial. Right now, we
> support two modes (not counting the `--untracked` stuff): --keep-index and
> --no-keep-index. In both cases, we seem to create a merge commit whose
> tree reflects the working directory and whose first parent is HEAD and
> whose second parent is a single commit on top of HEAD (which contains
> either no changes in the case of --no-keep-index, or whose tree reflects
> the index in case of --keep-index).
>
> To extend that to the conflict case, we could introduce a new flag
> --with-conflicts, and have the commit structure
>
> Worktree
> | \
> | index stage 0
> | / | \
> | stage 1 stage 2 stage 3
> | / / /
> HEAD ---------------
>
> The only tricky thing I can see is to maintain backwards compatibility if
> possible, so that old `git stash` will do something at least semi-sensible
> with those commit structures.
>
> It might be too small a project, after all.
Yeah, looking at this I think you're right. Thanks for helping work
through this.
> Ciao,
> Dscho
next prev parent reply other threads:[~2019-02-07 21:33 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 9:16 GSoC 2019: Git's application submitted Christian Couder
[not found] ` <CAL21Bm=K6zZ=APkiP3A_X7xVoOfx-MY2435YMp5y1ztE-xyYtg@mail.gmail.com>
2019-02-04 12:54 ` Christian Couder
2019-02-04 21:52 ` Thomas Gummerer
2019-02-05 21:17 ` Thomas Gummerer
2019-02-05 22:00 ` Christian Couder
2019-02-06 22:09 ` Thomas Gummerer
2019-02-07 19:39 ` Johannes Schindelin
2019-02-07 21:33 ` Thomas Gummerer [this message]
2019-02-11 5:41 ` Оля Тележная
2019-02-11 7:45 ` Christian Couder
2019-02-11 8:31 ` Оля Тележная
2019-02-11 10:52 ` Christian Couder
2019-02-13 22:36 ` Elijah Newren
2019-02-14 9:48 ` Christian Couder
2019-02-11 8:35 ` Christian Couder
2019-02-11 22:18 ` Thomas Gummerer
2019-02-11 23:58 ` Christian Couder
2019-02-12 20:25 ` Thomas Gummerer
2019-02-12 20:49 ` Christian Couder
2019-02-12 22:13 ` Thomas Gummerer
2019-02-06 12:27 ` Johannes Schindelin
2019-03-05 12:04 ` Duy Nguyen
2019-03-05 12:23 ` Duy Nguyen
2019-03-06 4:49 ` Jeff King
2019-03-06 9:36 ` Duy Nguyen
2019-03-06 19:08 ` Jeff King
2019-03-06 14:16 ` Johannes Schindelin
2019-03-18 12:51 ` Duy Nguyen
2019-03-18 16:37 ` Christian Couder
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=20190207213326.GF6085@hank.intra.tgummerer.com \
--to=t.gummerer@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=Matthieu.Moy@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=olyatelezhnaya@gmail.com \
--cc=peff@peff.net \
--cc=szeder.dev@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).