Re: [GSoC][RFC] discussion about stashing with conflicts

2019-04-08 Thread Thomas Gummerer
On 04/08, Kapil Jain wrote: > while understanding add_index_entry_with_check() > i got to do_invalidate_path(). > > the commit hash for do_invalidate_path() function is > `749864627c2d3c33bbc56d7ba0b5542af698cc40` > > in the commit message it is explained that, cache-tree is used to > store objec

Re: [GSoC][RFC] discussion about stashing with conflicts

2019-04-08 Thread Kapil Jain
while understanding add_index_entry_with_check() i got to do_invalidate_path(). the commit hash for do_invalidate_path() function is `749864627c2d3c33bbc56d7ba0b5542af698cc40` in the commit message it is explained that, cache-tree is used to store object names of index file objects and it is kept

Re: [GSoC][RFC] discussion about stashing with conflicts

2019-04-08 Thread Duy Nguyen
On Mon, Apr 8, 2019 at 6:00 PM Kapil Jain wrote: > for finding that commit message did you do something like this: > git log -L :repo_read_index_unmerged:read-cache.c No. I'm old fashioned. I just do "git log --patch --follow " then search read_index_unmerged, which should at least appear in the

Re: [GSoC][RFC] discussion about stashing with conflicts

2019-04-08 Thread Kapil Jain
On Mon, Apr 8, 2019 at 4:02 PM Duy Nguyen wrote: > > Sometimes when I don't understand what some code does, I look at "git > log --patch". In this case, there a big explanation in ad3762042a > (read-cache: fix directory/file conflict handling in > read_index_unmerged(), 2018-07-31) that might help

Re: [GSoC][RFC] discussion about stashing with conflicts

2019-04-08 Thread Duy Nguyen
On Mon, Apr 8, 2019 at 12:49 PM Kapil Jain wrote: > > On Mon, Apr 8, 2019 at 12:09 AM Thomas Gummerer wrote: > > > > On 04/07, Kapil Jain wrote: > > > > > > 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

Re: [GSoC][RFC] discussion about stashing with conflicts

2019-04-07 Thread Kapil Jain
On Mon, Apr 8, 2019 at 12:09 AM Thomas Gummerer wrote: > > On 04/07, Kapil Jain wrote: > > > > 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

Re: [GSoC][RFC] discussion about stashing with conflicts

2019-04-07 Thread Thomas Gummerer
On 04/07, Kapil Jain wrote: > 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 t