Home » Mailing list archives » git » 2007 » April » 25

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

Previous thread: basic question by Yakov Lerner on Wednesday, April 25, 2007 - 5:34 am. (2 messages)

Next thread: using stgit/guilt for public branches by Michael S. Tsirkin on Wednesday, April 25, 2007 - 8:20 am. (12 messages)
[view original message]
From: Andy Parkins <andyparkins@...>
To: <git@...>
Subject: git-ls-files -m lists the same file multiple times
Date: Wednesday, April 25, 2007 - 5:35 am

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

-
[view original message]
From: Junio C Hamano <junkio@...>
To: Andy Parkins <andyparkins@...>
Cc: <git@...>
Subject: Re: git-ls-files -m lists the same file multiple times
Date: Wednesday, April 25, 2007 - 2:25 pm

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.


-
[view original message]
From: Andy Parkins <andyparkins@...>
To: <git@...>
Cc: Junio C Hamano <junkio@...>
Subject: Re: git-ls-files -m lists the same file multiple times
Date: Wednesday, April 25, 2007 - 2:52 pm

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


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

-
[view original message]
From: Junio C Hamano <junkio@...>
To: Andy Parkins <andyparkins@...>
Cc: <git@...>
Subject: Re: git-ls-files -m lists the same file multiple times
Date: Wednesday, April 25, 2007 - 3:20 pm

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 ;-)


-
[view original message]
From: Andy Parkins <andyparkins@...>
To: <git@...>
Cc: Junio C Hamano <junkio@...>
Subject: Re: git-ls-files -m lists the same file multiple times
Date: Wednesday, April 25, 2007 - 4:47 pm

Ahead of me again. :-) good stuff.


Andy

--

Dr Andy Parkins, M Eng (hons), MIET

andyparkins@gmail.com

-
Previous thread: basic question by Yakov Lerner on Wednesday, April 25, 2007 - 5:34 am. (2 messages)

Next thread: using stgit/guilt for public branches by Michael S. Tsirkin on Wednesday, April 25, 2007 - 8:20 am. (12 messages)