Re: [PATCH v3] diff-lib.c: handle empty deleted ita files

2019-08-19 Thread Junio C Hamano
Varun Naik writes: > This function is probably not the place where we want to make changes. > It would be better to change diff-lib.c:show_modified() and > diff.c:diff_change() to consider the intent-to-add bit when performing a > diff. I do agree that diff-lib.c::show_modified(), which is about

Re: [PATCH v3] diff-lib.c: handle empty deleted ita files

2019-08-19 Thread Varun Naik
On Thu, Aug 15, 2019 at 12:06 PM Junio C Hamano wrote: > > /* > * i-t-a entries do not actually exist in the index (if we're > * looking at its content) > */ > if (o->index_only && > revs->diffopt.ita_invisible_in_index && > idx &&

Re: [PATCH v3] diff-lib.c: handle empty deleted ita files

2019-08-15 Thread Junio C Hamano
Varun Naik writes: > diff --git a/diff-lib.c b/diff-lib.c > index 61812f48c2..29dba467d5 100644 > --- a/diff-lib.c > +++ b/diff-lib.c > @@ -433,8 +433,11 @@ static void do_oneway_diff(struct unpack_trees_options > *o, > > /* >* Something removed from the tree? > + * Consider

Re: [PATCH v3] diff-lib.c: handle empty deleted ita files

2019-08-15 Thread Varun Naik
On Thu, Aug 1, 2019 at 9:16 AM Varun Naik wrote: > > It is possible to delete a committed file from the index and then add it > as intent-to-add. Certain forms of `git diff` should show the file. > After `git reset HEAD`, the file should be identical in the index and > HEAD. The commands already w

[PATCH v3] diff-lib.c: handle empty deleted ita files

2019-08-01 Thread Varun Naik
It is possible to delete a committed file from the index and then add it as intent-to-add. Certain forms of `git diff` should show the file. After `git reset HEAD`, the file should be identical in the index and HEAD. The commands already work correctly if the file has contents in HEAD. This patch p