`git ls-files` includes unmerged files thrice

Question

For example:

$ git status
On branch master
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Unmerged paths:
  (use "git add <file>..." to mark resolution)

    both modified:   test.txt

$ git ls-files
test.txt
test.txt
test.txt

Is there any way to make it list files of this kind only once too? I only need the file names.

Consider using `git status --porcelain` or `git status --porcelain=v2` for machine-readable output. Or, use `git ls-files --stage` and parse the full output. — torek, May 19 '20 at 22:23
Good suggestion, but `git status` does not support all the options I need. In particular, there's no way to include the unmodified files in the output. — Dmitry, May 19 '20 at 22:48

eftshift0 · Answer 1 · 2020-05-19T22:26:39.787

2

That happens when there is a conflict. Each one of them is a different version of the file. Check with:

git ls-files -s

Take a look at git help read-tree, the section about 3-way merge. The important part for you is this: ...and you will end up with an index with all of the <tree1> entries in "stage1", all of the <tree2> entries in "stage2" and all of the <tree3> entries in "stage3". When performing a merge of another branch into the current branch, we use the common ancestor tree as <tree1>, the current branch head as <tree2>, and the other branch head as <tree3>

edited May 19 '20 at 22:26

answered May 19 '20 at 22:18

eftshift0

26,375
3
36
60

Yes, the question is about conflicted files. – Dmitry May 19 '20 at 22:24
This answer is good, but adds nothing new to me personally. Have an upvote, though. And thanks. – Dmitry May 19 '20 at 22:38
1

If you want to see them only once, you might use tools outside of git for that: `git ls-files | uniq`. Pehaps keep it as a (bash) alias? – eftshift0 May 19 '20 at 23:32
I'm using it in a script. Oh well, `uniq` is pretty good, thank you. – Dmitry May 20 '20 at 02:11

score 1 · Answer 2 · answered May 20 '20 at 00:03

1

Is there any way to make it list files of this kind only once too?

git ls-files | sort -u

Git tends not to duplicate existing tools.

answered May 20 '20 at 00:03

jthill

55,082
5
77
137

`git ls-files` includes unmerged files thrice

2 Answers2