Thread (34 messages) flat view 34 messages, 4 authors, 2021-01-24
STALE2035d

Revision v2 of 5 in this series.

Revisions (5)
  1. v2 current
  2. v4 [diff vs current]
  3. v5 [diff vs current]
  4. v6 [diff vs current]
  5. v7 [diff vs current]

[PATCH v2 0/2] builtin/ls-files.c:add git ls-file --dedup option

From: 阿德烈 via GitGitGadget <hidden>
Date: 2021-01-08 14:38:04

I am reading the source code of git ls-files and learned that git ls -files
may have duplicate entries when conflict occurs in a branch merge or when
different options are used at the same time. Users may fell confuse when
they see these duplicate entries.

As Junio C Hamano said ,it have odd behaviour.

Therefore, we can provide an additional option to git ls-files to delete
those repeated information.

This fixes https://github.com/gitgitgadget/git/issues/198

Thanks!

ZheNing Hu (2):
  builtin/ls-files.c:add git ls-file --dedup option
  builtin:ls-files.c:add git ls-file --dedup option

 Documentation/git-ls-files.txt |  4 +++
 builtin/ls-files.c             | 41 ++++++++++++++++++++--
 t/t3012-ls-files-dedup.sh      | 63 ++++++++++++++++++++++++++++++++++
 3 files changed, 105 insertions(+), 3 deletions(-)
 create mode 100755 t/t3012-ls-files-dedup.sh


base-commit: 6d3ef5b467eccd2769f1aa1c555d317d3c8dc707
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-832%2Fadlternative%2Fls-files-dedup-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-832/adlternative/ls-files-dedup-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/832

Range-diff vs v1:

 1:  0261e5d245e = 1:  0261e5d245e builtin/ls-files.c:add git ls-file --dedup option
 -:  ----------- > 2:  a09a5098aa6 builtin:ls-files.c:add git ls-file --dedup option

-- 
gitgitgadget
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help