git diff --no-index refuses to compare if args are directory and file,
instead of usual diff.
Now git diff --no-index modifies args, if they're directory and file,
and diffs files, as usual diff does.
Changes are done in diff_no_index().
Helped-by: Junio C Hamano
Signed-off-by: Yurii She
>> diff --git a/diff-no-index.c b/diff-no-index.c
>> index 265709b..9a3439a 100644
>> --- a/diff-no-index.c
>> +++ b/diff-no-index.c
>> @@ -97,8 +97,39 @@ static int queue_diff(struct diff_options *o,
>> if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
>> return -1;
>>
>> -
sage about file\directory conflict left as
is until further guidence.
Signed-off-by: Yurii Shevtsov
---
diff-no-index.c | 35 +--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/diff-no-index.c b/diff-no-index.c
index 265709b..9a3439a 100644
--- a/
ame of the file at the end of the directory" logic
should be put to diff_no_index() which will also include calling
get_mode() for each path[] member? Sorry again for asking so much
questions
2015-03-16 19:14 GMT+02:00 Junio C Hamano :
> Yurii Shevtsov writes:
>
>>> ... As
I'm going to write for this idea. As I know good proposal should
contain timeline and Todo estimations. What should I write in my
proposal, since there is no clear plan for converting scripts to
builtins. Thanks in advance!
--
To unsubscribe from this list: send the line "unsubscribe git" in
the bo
> Matthieu Moy writes:
>
>>> --- a/diff-no-index.c
>>> +++ b/diff-no-index.c
>>> @@ -97,8 +97,25 @@ static int queue_diff(struct diff_options *o,
>>> if (get_mode(name1, &mode1) || get_mode(name2, &mode2))
>>> return -1;
>>>
>>> - if (mode1 && mode2 && S_ISDIR(mode1)
Changes 'git diff --no-index $directory $file' behaviour.
Now it is transformed to 'git diff --no-index $directory/&file $file'
instead of throwing an error.
Signed-off-by: Yurii Shevtsov gmail.com>
---
diff-no-index.c | 21 +++--
1 files changed, 19
As I understood there are four unsolved microprojects. I think I can
deal with "Make "git diff --no-index $directory $file" DWIM better"
but I don't understand what exactly should I do. I tried to run 'git
diff --no-index ~/git/ diff.h' cmd on git sources but it says 'error:
file/directory conflict
8 matches
Mail list logo