From: t.gummerer@gmail•com
To: Yurii Shevtsov <ungetch@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH/RFC][GSoC] make "git diff --no-index $directory $file" DWIM better.
Date: Sun, 15 Mar 2015 19:13:22 +0100 [thread overview]
Message-ID: <20150315181322.GC17591@hank> (raw)
In-Reply-To: <CAHLaBNLQ8-JzEBjypvJDDzhW8SwfzujuOknC_QWar+cL18cR3A@mail.gmail.com>
[re-added cc to the list]
On 03/15, Yurii Shevtsov wrote:
> Hi, and thank for your reply
>
> >> 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)
>
> I really checked behavior of usual diff. And swapping arguments
> doesn't affect result. At first I had doubts about task formulation,
> so I asked about it and got the answer:
> gmane.comp.version-control.git/265479 Am I misunderstood it again?
Using the same example as in that thread, I get the following output:
tommy at hank in work[1] $ diff -u git junk/diff.h
--- git/diff.h 2014-12-26 21:00:20.690774933 +0100
+++ junk/diff.h 2015-03-15 18:02:03.441049918 +0100
@@ -357,3 +357,4 @@
extern void setup_diff_pager(struct diff_options *);
#endif /* DIFF_H */
+hello
tommy at hank in work $ diff -u junk/diff.h git
--- junk/diff.h 2015-03-15 18:02:03.441049918 +0100
+++ git/diff.h 2014-12-26 21:00:20.690774933 +0100
@@ -357,4 +357,3 @@
extern void setup_diff_pager(struct diff_options *);
#endif /* DIFF_H */
-hello
Notice the +hello vs. -hello in the last line off the diff. Git with
your patch on the other hand gives me +hello in both cases.
tommy at hank in work[1] $ g diff --no-index git junk/diff.h
diff --git a/git/diff.h b/junk/diff.h
index b4a624d..81671dd 100644
--- a/git/diff.h
+++ b/junk/diff.h
@@ -357,3 +357,4 @@ extern int print_stat_summary(FILE *fp, int files,
extern void setup_diff_pager(struct diff_options *);
#endif /* DIFF_H */
+hello
tommy at hank in work[1] $ g diff --no-index junk/diff.h git
diff --git a/git/diff.h b/junk/diff.h
index b4a624d..81671dd 100644
--- a/git/diff.h
+++ b/junk/diff.h
@@ -357,3 +357,4 @@ extern int print_stat_summary(FILE *fp, int files,
extern void setup_diff_pager(struct diff_options *);
#endif /* DIFF_H */
+hello
So while I think the behaviour with git diff --no-index $directory $file
is correct (minus the comments by Matthieu), git diff --no-index $file
$directory is not, I think.
next prev parent reply other threads:[~2015-03-15 18:13 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-15 15:35 [PATCH/RFC][GSoC] make "git diff --no-index $directory $file" DWIM better Yurii Shevtsov
2015-03-15 17:30 ` Matthieu Moy
2015-03-16 3:50 ` Junio C Hamano
2015-03-16 16:23 ` Yurii Shevtsov
2015-03-16 17:14 ` Junio C Hamano
2015-03-16 17:47 ` Yurii Shevtsov
2015-03-16 19:20 ` Junio C Hamano
2015-03-15 17:34 ` t.gummerer
[not found] ` <CAHLaBNLQ8-JzEBjypvJDDzhW8SwfzujuOknC_QWar+cL18cR3A@mail.gmail.com>
2015-03-15 18:13 ` t.gummerer [this message]
2015-03-15 18:04 ` Eric Sunshine
[not found] ` <CAHLaBN+RVpDrG9OewUS7LCYaEOvVqsTY3znapgMj7VrMJWHaDw@mail.gmail.com>
2015-03-15 21:28 ` Eric Sunshine
2015-03-15 22:00 ` Junio C Hamano
2015-03-15 20:17 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150315181322.GC17591@hank \
--to=t.gummerer@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=ungetch@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox