threads / discuss / 7831

git-ls-files -m lists the same file multiple times

Subject: git-ls-files -m lists the same file multiple times

## tl;dr

5 messages between Apr 25, 2007 and Apr 25, 2007.

replies: 4people: 2as markdown or json

Andy Parkins· Apr 25, 2007, 09:35 UTC · lore

Hello,

I did a merge, which had conflicts, and then fixed the conflicts. To see what files I'd changed I did git-ls-files -m. This listed the same file multiple times. Some of them twice and some of them three times.

I guess that it's showing different stages; but as the list is just filename, there is no way to tell which is which and it is just confusing.

Andy

-- 
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com

Junio C Hamano· Apr 25, 2007, 18:25 UTC · re: Andy Parkins · lore

Re: git-ls-files -m lists the same file multiple times

Andy Parkins <andyparkins@gmail.com> writes:

Show 6 quoted lines

> I did a merge, which had conflicts, and then fixed the conflicts.  To see what 
> files I'd changed I did git-ls-files -m.  This listed the same file multiple 
> times.  Some of them twice and some of them three times.
>
> I guess that it's showing different stages; but as the list is just filename, 
> there is no way to tell which is which and it is just confusing.

I did not imagine that anybody actually found 'ls-files -m' useful, either during a conflicted merge or under the normal situation. 'git diff --stat' is usually much more pleasant to see.

Use 'ls-files -u' during conflicted merge and be happy.

Andy Parkins· Apr 25, 2007, 18:52 UTC · re: Junio C Hamano · lore

Re: git-ls-files -m lists the same file multiple times

On Wednesday 2007, April 25, Junio C Hamano wrote:

Show 14 quoted lines

> Andy Parkins <andyparkins@gmail.com> writes:
> > I did a merge, which had conflicts, and then fixed the conflicts. 
> > To see what files I'd changed I did git-ls-files -m.  This listed
> > the same file multiple times.  Some of them twice and some of them
> > three times.
> >
> > I guess that it's showing different stages; but as the list is just
> > filename, there is no way to tell which is which and it is just
> > confusing.
>
> I did not imagine that anybody actually found 'ls-files -m'
> useful, either during a conflicted merge or under the normal
> situation.  'git diff --stat' is usually much more pleasant to
> see.

Definitely. You see I am in the strange position of being able to type faster than I can think, so typing

 git-ls-files -m | xargs git add

Saves me the trouble of engaging my brain :-)

> Use 'ls-files -u' during conflicted merge and be happy.

Great stuff - that's the one I wanted; in fact git-ls-files -m did what I wanted, because it didn't matter that xargs listed the same file multiple times.

Thanks

Andy

-- 
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com

Junio C Hamano· Apr 25, 2007, 19:20 UTC · re: Andy Parkins · lore

Re: git-ls-files -m lists the same file multiple times

Andy Parkins <andyparkins@gmail.com> writes:

Show 6 quoted lines

> Definitely.  You see I am in the strange position of being able to type 
> faster than I can think, so typing
>
>  git-ls-files -m | xargs git add
>
> Saves me the trouble of engaging my brain :-)

Well, I do not think being able to type faster is so unique. I know more than a handful people who share that ;-).

You can use "git add -u" in 1.5.2 ;-)

Andy Parkins· Apr 25, 2007, 20:47 UTC · re: Junio C Hamano · lore

Re: git-ls-files -m lists the same file multiple times

On Wednesday 2007, April 25, Junio C Hamano wrote:

> Well, I do not think being able to type faster is so unique.  I
> know more than a handful people who share that ;-).

:-) Absolutely - not thinking laterally enough there was I?

> You can use "git add -u" in 1.5.2 ;-)

Ahead of me again. :-) good stuff.

Andy

-- 
Dr Andy Parkins, M Eng (hons), MIET
andyparkins@gmail.com