From: Kapil Jain <jkapil.cs@gmail.com>
To: git <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Thomas Gummerer <t.gummerer@gmail.com>
Subject: [GSoC][RFC] discussion about stashing with conflicts
Date: Sun, 7 Apr 2019 18:38:13 +0530 [thread overview]
Message-ID: <CAMknYEN1x5zDPn4vaZmw3ch-Oy2=NQ=cfF9YmXumcbZGWvTToQ@mail.gmail.com> (raw)
below is my understanding from reading the parts of code as suggested on IRC.
what is the use of ce_stage macro ?
tells about stage of an index entry.
if ce_stage says, stage #0 i.e staging area, then that index entry is
in staging area
and nothing needs to be done.
else a temporary index entry is created and repo_read_index_unmerged()
calls other function and tries to add it to index.
if it fails, it issues an error.
is this correct interpretation ?
1) in repo_read_index_unmerged(), why don't we make the value of
`unmerged` 0, if adding index entry is successful; as the entry is no
longer unmerged ?
2) what is ADD_CACHE_SKIP_DFCHECK ?
i am unsure if i get its meaning, cache.h says that it means "Ok to
skip DF conflict checks"
what are DF conflict checks ? something about diffing to check for
conflicts ? if so why are we skipping it this entry had conflicts in
the past maybe it will create again.
3) what is cache_nr variable in index_state struct ? what is its use ?
Now, about add_index_entry_with_check(), i don't fully understand this
function but concentrating on the part pointed by dscho.
https://github.com/git/git/blob/v2.21.0/read-cache.c#L1284-L1294
/*
* Inserting a merged entry ("stage 0") into the index
* will always replace all non-merged entries..
*/
so this is the part we need to play with for the project
https://git.github.io/SoC-2019-Ideas/#teach-git-stash-to-handle-unmerged-index-entries
try and change this in some-way to not replace those unmerged entries
or store them some place else ?
next reply other threads:[~2019-04-07 13:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-07 13:08 Kapil Jain [this message]
2019-04-07 18:38 ` [GSoC][RFC] discussion about stashing with conflicts Thomas Gummerer
2019-04-08 5:48 ` Kapil Jain
2019-04-08 10:31 ` Duy Nguyen
2019-04-08 11:00 ` Kapil Jain
2019-04-08 11:09 ` Duy Nguyen
2019-04-08 14:27 ` Kapil Jain
2019-04-08 21:55 ` Thomas Gummerer
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='CAMknYEN1x5zDPn4vaZmw3ch-Oy2=NQ=cfF9YmXumcbZGWvTToQ@mail.gmail.com' \
--to=jkapil.cs@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=t.gummerer@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).