git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH] range-diff: allow to diff files regardless submodule

From
LMLucas De Marchi <lucas.de.marchi@gmail.com>
Date
Oct 11, 2018, 08:14 UTC
Message-ID
<CAKi4VAL+qSObOABeNHVXGytE9aB3sUJtecE5jYF6_ZfDA+J0ZQ@mail.gmail.com>
In-Reply-To
<87in29dj55.fsf@evledraar.gmail.com>

On Thu, Oct 11, 2018 at 12:42 AM Ævar Arnfjörð Bjarmason <avarab@gmail.com> wrote:

Show 16 quoted lines
>
>
> On Wed, Oct 10 2018, Lucas De Marchi wrote:
>
> > Do like it's done in grep so mode doesn't end up as
> > 0160000, which means range-diff doesn't work if one has
> > "submodule.diff = log" in the configuration. Without this
> > while using range-diff I only get a
> >
> >     Submodule a 0000000...0000000 (new submodule)
>
> I'm not familiar enough with this to tell what the real problem is
> that's being solved from the commit message, but if it means that now
> range-diff works in some configuration, presumably that can be reduced
> to a simple set of commands that didn't work before but now does, and
> therefore a test in t/t3206-range-diff.sh.

$ git config --global diff.submodule log $ git range-diff

This produces the output above

$ git config --global diff.submodule short $ git range-diff

This blocks forever in a wait4() call and prints this when terminated: fatal: exec 'diff': cd to 'a' failed: Not a directory

Lucas De Marchi
Show 21 quoted lines
>
> > instead of the diff between the revisions.
> >
> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
> > ---
> >  range-diff.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/range-diff.c b/range-diff.c
> > index 60edb2f518..bd8083f2d1 100644
> > --- a/range-diff.c
> > +++ b/range-diff.c
> > @@ -354,7 +354,7 @@ static struct diff_filespec *get_filespec(const char *name, const char *p)
> >  {
> >       struct diff_filespec *spec = alloc_filespec(name);
> >
> > -     fill_filespec(spec, &null_oid, 0, 0644);
> > +     fill_filespec(spec, &null_oid, 0, 0100644);
> >       spec->data = (char *)p;
> >       spec->size = strlen(p);
> >       spec->should_munmap = 0;
-- 
Lucas De Marchi
Previous: Ævar Arnfjörð BjarmasonNext: Lucas De Marchi
Message 7 of 17 in “range-diff: allow to diff files regardless submodule”
  1. range-diff: allow to diff files regardless submoduleLucas De Marchi, Oct 10, 2018
  2. brian m. carlsonOct 11, 2018
  3. Lucas De MarchiOct 11, 2018
  4. Johannes SchindelinOct 12, 2018
  5. brian m. carlsonOct 12, 2018
  6. Ævar Arnfjörð BjarmasonOct 11, 2018
  7. Lucas De MarchiOct 11, 2018
  8. range-diff: allow to diff files regardless submoduleLucas De Marchi, Oct 11, 2018
  9. Johannes SchindelinOct 12, 2018
  10. Junio C HamanoOct 11, 2018
  11. Lucas De MarchiOct 23, 2018
  12. Junio C HamanoOct 24, 2018
  13. Lucas De MarchiOct 24, 2018
  14. Junio C HamanoOct 24, 2018
  15. Junio C HamanoOct 24, 2018
  16. Lucas De MarchiOct 24, 2018
  17. range-diff: allow to diff files regardless of submodule configLucas De Marchi, Oct 24, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.