cvs diff -l equivalent?

Someone popped this question on me.  The closest I got was:

   git diff .

But that still recurses.  Any solutions without patching?

Hi,

On Wed, 30 Jul 2008, Stephen R. van den Berg wrote:

I do not know cvs that well anymore. So I do not know what -l does. Care to explain?

That is easy.  52 light ones.

Ciao, Dscho

Johannes Schindelin wrote:

Usage: cvs diff [-lR] [-k kopt] [format_options]
    [[-r rev1 | -D date1] [-r rev2 | -D date2]] [files...]
        -l      Local directory only, not recursive

It shows the diff for all files in the current directory, nothing deeper, nothing higher.

I presume you mean "lightweeks", and yes, that would probably fit the bill :-).

Hi,

On Wed, 30 Jul 2008, Stephen R. van den Berg wrote:

Okay.  This is my version of a solution:

	$ find . -maxdepth 1 -type f -print0 | xargs -0 git diff

And no, there is not an easier way. Probably since Git has a snapshot based idea of the contents, i.e. it does not think that the files in a revision are decoupled. Not even the ones in different directories.

Ciao, Dscho

Stephen R. van den Berg wrote:

Maybe a scripted version?  For just 'git diff .', this should work:

  git diff $(git ls-files . | grep -v /)

That will still do the wrong thing if you diff against an older commit with a different list of files. In that case you need the list of files in the other side of the diff too:

  git diff HEAD^..  -- $(git ls-files . | grep -v /; git ls-tree HEAD^ | cut -f2)

- Thomas

Thomas Rast wrote:

git diff $(git ls-files --exclude-standard . | fgrep -v /)

comes the closest, so it seems.

This doesn't seem to do the right thing, it messes up with which commit we diff.

2008/7/30 Stephen R. van den Berg <srb@cuci.nl>:

Another option than the ones suggested: git diff|filterdiff -x '*/*/*'

filterdiff is available from the "patchutils" package.

On Wed, 30 Jul 2008, Stephen R. van den Berg wrote:

Not without patching, no. When generating a patch, git diff always recurses.

I suspect adding some kind of "-l" flag would be about five lines of code, though, so if you really need it... Hint, hint.

		Linus