Re: [PATCH/RFC][GSoC] make "git diff --no-index $directory $file" DWIM better.
- From
t.gummerer@gmail.com <t.gummerer@gmail.com>
- Date
- Mar 15, 2015, 17:34 UTC
- Message-ID
- <20150315173451.GB17591@hank>
- In-Reply-To
- <CAHLaBN+93mp6PQmtfjOHSvfW7iwDXwPitGQ5W1am9KBm9EZV2Q@mail.gmail.com>
Hi,
On 03/15, Yurii Shevtsov wrote:
> 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.
The commit message should describe why the change is made, see Documentation/SubmittingPatches, section (2)
> Signed-off-by: Yurii Shevtsov <ungetch <at> gmail.com>
Please use your full email here, without replacing @ with <at>
> --- > diff-no-index.c | 21 +++++++++++++++++++--
You should probably add a test for the new behaviour in t/t4053-diff-no-index.sh.
Show 20 quoted lines
> 1 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/diff-no-index.c b/diff-no-index.c
> index 265709b..4e71b36 100644
> --- 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) != S_ISDIR(mode2))
> - return error("file/directory conflict: %s, %s", name1, name2);
> + if (mode1 && mode2 && S_ISDIR(mode1) != S_ISDIR(mode2)) {
> + struct strbuf dirnfile;
> + const char *dir, *file;
> + char *filename;
> + int ret = 0;
> +
> + dir = S_ISDIR(mode1) ? name1 : name2;
> + file = (dir == name1) ? name2 : name1;This makes git diff --no-index $directory $file the same as git diff --no-index $file $directory. Shouldn't these commands give different results? (See the behaviour of diff in this case, and compare it to the behaviour you introduced here)
Show 11 quoted lines
> + strbuf_init(&dirnfile, strlen(name1) + strlen(name2) + 2); > + strbuf_addstr(&dirnfile, dir); > + if (dirnfile.buf[dirnfile.len - 1] != '/') > + strbuf_addch(&dirnfile, '/'); > + filename = strrchr(file, '/'); > + strbuf_addstr(&dirnfile, filename ? (filename + 1) : file); > + ret = queue_diff(o, dirnfile.buf, file); > + strbuf_release(&dirnfile); > + > + return ret; > + }
Your MUA seems to have replaced tabs with spaces in this email. The easiest way to get the formatting correct is the git send-email tool. You should also try to sending the mail to yourself first and see if it applies correctly with git am.
Show 11 quoted lines
>
> if (S_ISDIR(mode1) || S_ISDIR(mode2)) {
> struct strbuf buffer1 = STRBUF_INIT;
> --
>
> I hope I understood task correct. I think this patch requires writing
> additional tests, so that's what I'm going to do now.
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html