From: "阿德烈 via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: "Eric Sunshine" <sunshine@sunshineco.com>,
胡哲宁 <adlternative@gmail.com>,
"Junio C Hamano" <gitster@pobox.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
阿德烈 <adlternative@gmail.com>
Subject: [PATCH v7 0/3] builtin/ls-files.c:add git ls-file --dedup option
Date: Sun, 24 Jan 2021 10:54:24 +0000 [thread overview]
Message-ID: <pull.832.v7.git.1611485667.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.832.v6.git.1611397210.gitgitgadget@gmail.com>
I am reading the source code of git ls-files and learned that git ls-files
may have duplicate files name when there are unmerged path in a branch merge
or when different options are used at the same time. Users may fell confuse
when they see these duplicate file names.
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 (3):
ls_files.c: bugfix for --deleted and --modified
ls_files.c: consolidate two for loops into one
ls-files.c: add --deduplicate option
Documentation/git-ls-files.txt | 8 ++++
builtin/ls-files.c | 85 ++++++++++++++++++++--------------
t/t3012-ls-files-dedup.sh | 66 ++++++++++++++++++++++++++
3 files changed, 124 insertions(+), 35 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-v7
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-832/adlternative/ls-files-dedup-v7
Pull-Request: https://github.com/gitgitgadget/git/pull/832
Range-diff vs v6:
1: fbc38ce9075 ! 1: 8b02367a359 ls_files.c: bugfix for --deleted and --modified
@@ Commit message
ie_modified() when lstat() has failed.
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
+ [jc: fixed misindented code]
+ Signed-off-by: Junio C Hamano <gitster@pobox.com>
## builtin/ls-files.c ##
@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_struct *dir)
2: 3997d390883 ! 2: f9d5e44d2c0 ls_files.c: consolidate two for loops into one
@@ Metadata
## Commit message ##
ls_files.c: consolidate two for loops into one
- Refactor the two for loops into one,skip showing the ce if it
- has the same name as the previously shown one, only when doing so
- won't lose information.
+ This will make it easier to show only one entry per filename in the
+ next step.
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
+ [jc: corrected the log message]
+ Signed-off-by: Junio C Hamano <gitster@pobox.com>
## builtin/ls-files.c ##
@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_struct *dir)
3: 07b603fd97c ! 3: 384f77a4c18 ls-files.c: add --deduplicate option
@@ Metadata
## Commit message ##
ls-files.c: add --deduplicate option
- In order to provide users a better experience
- when viewing information about files in the index
- and the working tree, the `--deduplicate` option will suppress
- some duplicate name under some conditions.
+ During a merge conflict, the name of a file may appear multiple
+ times in "git ls-files" output, once for each stage. If you use
+ both `--delete` and `--modify` at the same time, the output may
+ mention a deleted file twice.
- In a merge conflict, one file name of "git ls-files" output may
- appear multiple times. For example,now there is an unmerged path
- `a.c`,`a.c` will appear three times in the output of
- "git ls-files".We can use "git ls-files --deduplicate" to output
- `a.c` only one time.(unless `--stage` or `--unmerged` is
- used to view all the detailed information in the index)
+ When none of the '-t', '-u', or '-s' options is in use, these
+ duplicate entries do not add much value to the output.
- In addition, if you use both `--delete` and `--modify` at
- the same time, The `--deduplicate` option
- can also suppress file name output.
-
- Additional instructions:
- In order to display entries information,`deduplicate` suppresses
- the output of duplicate file names, not the output of duplicate
- entries information, so under the option of `-t`, `--stage`, `--unmerge`,
- `--deduplicate` will have no effect.
+ Introduce a new '--deduplicate' option to suppress them.
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
+ [jc: extended doc and rewritten commit log]
+ Signed-off-by: Junio C Hamano <gitster@pobox.com>
## Documentation/git-ls-files.txt ##
@@ Documentation/git-ls-files.txt: SYNOPSIS
@@ Documentation/git-ls-files.txt: OPTIONS
See OUTPUT below for more information.
+--deduplicate::
-+ Suppress duplicate entries when there are unmerged paths in index
-+ or `--deleted` and `--modified` are combined.
++ When only filenames are shown, suppress duplicates that may
++ come from having multiple stages during a merge, or giving
++ `--deleted` and `--modified` option at the same time.
++ When any of the `-t`, `--unmerged`, or `--stage` option is
++ in use, this option has no effect.
+
-x <pattern>::
--exclude=<pattern>::
--
gitgitgadget
next prev parent reply other threads:[~2021-01-24 10:55 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 8:53 [PATCH] builtin/ls-files.c:add git ls-file --dedup option 阿德烈 via GitGitGadget
2021-01-07 6:10 ` Eric Sunshine
2021-01-07 6:40 ` Junio C Hamano
2021-01-08 14:36 ` [PATCH v2 0/2] " 阿德烈 via GitGitGadget
2021-01-08 14:36 ` [PATCH v2 1/2] " ZheNing Hu via GitGitGadget
2021-01-08 14:36 ` [PATCH v2 2/2] builtin:ls-files.c:add " ZheNing Hu via GitGitGadget
2021-01-14 6:38 ` Eric Sunshine
2021-01-14 8:17 ` 胡哲宁
2021-01-14 12:22 ` [PATCH v3] ls-files.c: add " 阿德烈 via GitGitGadget
2021-01-15 0:59 ` Junio C Hamano
2021-01-17 3:45 ` 胡哲宁
2021-01-17 4:37 ` Junio C Hamano
2021-01-16 7:13 ` Eric Sunshine
2021-01-17 3:49 ` 胡哲宁
2021-01-17 5:11 ` Eric Sunshine
2021-01-17 23:04 ` Junio C Hamano
2021-01-18 14:59 ` Eric Sunshine
2021-01-17 4:02 ` [PATCH v4 0/3] builtin/ls-files.c:add git ls-file " 阿德烈 via GitGitGadget
2021-01-17 4:02 ` [PATCH v4 1/3] ls_files.c: bugfix for --deleted and --modified ZheNing Hu via GitGitGadget
2021-01-17 6:22 ` Junio C Hamano
2021-01-17 4:02 ` [PATCH v4 2/3] ls_files.c: consolidate two for loops into one ZheNing Hu via GitGitGadget
2021-01-17 4:02 ` [PATCH v4 3/3] ls-files: add --deduplicate option ZheNing Hu via GitGitGadget
2021-01-17 6:25 ` Junio C Hamano
2021-01-17 23:34 ` Junio C Hamano
2021-01-18 4:09 ` 胡哲宁
2021-01-18 6:05 ` 胡哲宁
2021-01-18 21:31 ` Junio C Hamano
2021-01-19 2:56 ` 胡哲宁
2021-01-19 6:30 ` [PATCH v5 0/3] builtin/ls-files.c:add git ls-file --dedup option 阿德烈 via GitGitGadget
2021-01-19 6:30 ` [PATCH v5 1/3] ls_files.c: bugfix for --deleted and --modified ZheNing Hu via GitGitGadget
2021-01-20 20:26 ` Junio C Hamano
2021-01-21 10:02 ` 胡哲宁
2021-01-19 6:30 ` [PATCH v5 2/3] ls_files.c: consolidate two for loops into one ZheNing Hu via GitGitGadget
2021-01-20 20:27 ` Junio C Hamano
2021-01-21 11:05 ` 胡哲宁
2021-01-19 6:30 ` [PATCH v5 3/3] ls-files.c: add --deduplicate option ZheNing Hu via GitGitGadget
2021-01-20 21:26 ` Junio C Hamano
2021-01-21 11:00 ` 胡哲宁
2021-01-21 20:45 ` Junio C Hamano
2021-01-22 9:50 ` 胡哲宁
2021-01-22 16:04 ` Johannes Schindelin
2021-01-22 18:02 ` Junio C Hamano
2021-03-19 13:54 ` GitGitGadget and `next`, was " Johannes Schindelin
2021-03-19 18:11 ` Junio C Hamano
2021-01-23 8:20 ` 胡哲宁
2021-01-22 15:46 ` [PATCH v6] " ZheNing Hu
2021-01-22 20:52 ` Junio C Hamano
2021-01-23 8:27 ` 胡哲宁
2021-01-23 10:20 ` [PATCH v6 0/3] builtin/ls-files.c:add git ls-file --dedup option 阿德烈 via GitGitGadget
2021-01-23 10:20 ` [PATCH v6 1/3] ls_files.c: bugfix for --deleted and --modified ZheNing Hu via GitGitGadget
2021-01-23 17:55 ` Junio C Hamano
2021-01-23 10:20 ` [PATCH v6 2/3] ls_files.c: consolidate two for loops into one ZheNing Hu via GitGitGadget
2021-01-23 19:50 ` Junio C Hamano
2021-01-23 10:20 ` [PATCH v6 3/3] ls-files.c: add --deduplicate option ZheNing Hu via GitGitGadget
2021-01-23 19:51 ` Junio C Hamano
2021-01-23 19:53 ` [PATCH v7 1/3] ls_files.c: bugfix for --deleted and --modified Junio C Hamano
2021-01-23 19:53 ` [PATCH v7 2/3] ls_files.c: consolidate two for loops into one Junio C Hamano
2021-01-23 19:53 ` [PATCH v7 3/3] ls-files.c: add --deduplicate option Junio C Hamano
2021-01-24 10:54 ` 阿德烈 via GitGitGadget [this message]
2021-01-24 10:54 ` [PATCH v7 1/3] ls_files.c: bugfix for --deleted and --modified ZheNing Hu via GitGitGadget
2021-01-24 22:04 ` Junio C Hamano
2021-01-25 6:05 ` 胡哲宁
2021-01-25 19:05 ` Junio C Hamano
2021-01-24 10:54 ` [PATCH v7 2/3] ls_files.c: consolidate two for loops into one ZheNing Hu via GitGitGadget
2021-01-24 10:54 ` [PATCH v7 3/3] ls-files.c: add --deduplicate option ZheNing Hu via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.832.v7.git.1611485667.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=adlternative@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sunshine@sunshineco.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).