# GSoC 2015. Microprojects

2 messages from 2015-03-14 to 2015-03-15. Participants: Yurii Shevtsov, Junio C Hamano.
Thread: https://gitlist.dev/t/38805

## Yurii Shevtsov, 2015-03-14 20:24

Subject: GSoC 2015. Microprojects
Message-ID: <CAHLaBNLX8KGUhROzW80SiM507=YpbfqdSiPm7Vm9vwK6vW-Z+Q@mail.gmail.com>
URL: https://gitlist.dev/e/CAHLaBNLX8KGUhROzW80SiM507%3DYpbfqdSiPm7Vm9vwK6vW-Z%2BQ%40mail.gmail.com

```
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: /home/localhost/git/, diff.h'. I have used
git many times, but I'm not familiar with git diff. Thanks in advance!

```

## Junio C Hamano, 2015-03-15 02:59

Subject: Re: GSoC 2015. Microprojects
Message-ID: <xmqqtwxnufsz.fsf@gitster.dls.corp.google.com>
URL: https://gitlist.dev/e/xmqqtwxnufsz.fsf%40gitster.dls.corp.google.com
In-Reply-To: <CAHLaBNLX8KGUhROzW80SiM507=YpbfqdSiPm7Vm9vwK6vW-Z+Q@mail.gmail.com>

```
Yurii Shevtsov <ungetch@gmail.com> writes:

> 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.

OK.

> I tried to run 'git
> diff --no-index ~/git/ diff.h' cmd on git sources but it says 'error:
> file/directory conflict: /home/localhost/git/, diff.h'.

There you have it.  Do you think erroring out is useful?  

Imagine a user who is used to the way ordinary "diff" command (not
"git diff") operates.  What would be the behaviour that may match
the expectation of such a user better?

In other words, if you have the source tree of git in ~/git and
then you have "diff.h" in your current directory, perhaps prepared
by doing something like this:

    $ cd $HOME
    $ git clone git://git.kernel.org/pub/scm/git/git.git git
    $ mkdir junk
    $ cp git/diff.h junk
    $ cd junk
    $ echo hello >>diff.h

what would the ordinary "diff" say when you do these commands (still
in that ~/junk directory)?

    $ diff -u ~/git diff.h
    $ diff -u diff.h ~/git

Wouldn't it be wonderful if "git diff --no-index" worked the same
way as these?

```