Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid duplicate entries in git ls-files for unmerged entries #198

Closed
dscho opened this issue May 17, 2019 · 2 comments
Closed

Avoid duplicate entries in git ls-files for unmerged entries #198

dscho opened this issue May 17, 2019 · 2 comments
Labels
leftoverbits From the Git mailing list: https://lore.kernel.org/git/?q=%23leftoverbits

Comments

@dscho
Copy link
Member

dscho commented May 17, 2019

This is a left-over bit: https://public-inbox.org/git/xmqq8sw17c3q.fsf@gitster-ct.c.googlers.com/
@dscho dscho added the leftoverbits From the Git mailing list: https://lore.kernel.org/git/?q=%23leftoverbits label May 17, 2019
@weekly-digest weekly-digest bot mentioned this issue May 19, 2019
Closed
@adlternative
Copy link

Hi ! I seem to fix this problem!
Look at:#832
Thanks!

@adlternative adlternative mentioned this issue Jan 6, 2021
Closed
adlternative added a commit to adlternative/git that referenced this issue Jan 8, 2021
@adlternative
builtin:ls-files.c:add git ls-file --dedup option
a09a509 
This commit standardizes the code format.
For git ls-file --dedup option added
relevant descriptions in Documentation/git-ls-files.txt
and wrote t/t3012-ls-files-dedup.sh test script
to prove the correctness of--dedup option.

this patch fixed: gitgitgadget#198
Thanks.

Signed-off-by: ZheNing Hu <adlternative@gmail.com>
adlternative added a commit to adlternative/git that referenced this issue Jan 14, 2021
@adlternative
ls-files.c: add --dedup option
5ce52c8 
In order to provide users a better experience
when viewing information about files in the index
and the working tree, the `--dedup` option will suppress
some duplicate options under some conditions.

In a merge conflict, one item of "git ls-files" output may
appear multiple times. For example,now the file `a.c` has
a conflict,`a.c` will appear three times in the output of
"git ls-files".We can use "git ls-files --dedup" to output
`a.c` only one time.(unless `--stage` or `--unmerged` is
used to view all the detailed information in the index)

In addition, if you use both `--delete` and `--modify` in
the same time, The `--dedup` option can also suppress modified
entries output.

`--dedup` option relevant descriptions in
`Documentation/git-ls-files.txt`,
the test script in `t/t3012-ls-files-dedup.sh`
prove the correctness of the `--dedup` option.

this patch fixed:
gitgitgadget#198
Thanks.

Signed-off-by: ZheNing Hu <adlternative@gmail.com>
@newren
Copy link

newren commented Jan 25, 2022

Already fixed in #832.

@newren newren closed this as completed Jan 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
leftoverbits From the Git mailing list: https://lore.kernel.org/git/?q=%23leftoverbits
Projects
None yet
Milestone
No milestone
Development

Successfully merging a pull request may close this issue.

builtin/ls-files.c:add git ls-file --dedup option adlternative/git
3 participants
@dscho @newren @adlternative