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 v6 0/3] builtin/ls-files.c:add git ls-file --dedup option
Date: Sat, 23 Jan 2021 10:20:07 +0000 [thread overview]
Message-ID: <pull.832.v6.git.1611397210.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.832.v5.git.1611037846.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 | 5 ++
builtin/ls-files.c | 85 ++++++++++++++++++++--------------
t/t3012-ls-files-dedup.sh | 66 ++++++++++++++++++++++++++
3 files changed, 121 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-v6
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-832/adlternative/ls-files-dedup-v6
Pull-Request: https://github.com/gitgitgadget/git/pull/832
Range-diff vs v5:
1: ec9464f6094 ! 1: fbc38ce9075 ls_files.c: bugfix for --deleted and --modified
@@ Commit message
## builtin/ls-files.c ##
@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_struct *dir)
+ for (i = 0; i < repo->index->cache_nr; i++) {
+ const struct cache_entry *ce = repo->index->cache[i];
+ struct stat st;
+- int err;
++ int stat_err;
+
+ construct_fullname(&fullname, repo, ce);
+
+@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_struct *dir)
+ continue;
if (ce_skip_worktree(ce))
continue;
- err = lstat(fullname.buf, &st);
+- err = lstat(fullname.buf, &st);
- if (show_deleted && err)
-- show_ce(repo, dir, ce, fullname.buf, tag_removed);
++ stat_err = lstat(fullname.buf, &st);
++ if (stat_err && (errno != ENOENT && errno != ENOTDIR))
++ error_errno("cannot lstat '%s'", fullname.buf);
++ if (stat_err && show_deleted)
+ show_ce(repo, dir, ce, fullname.buf, tag_removed);
- if (show_modified && ie_modified(repo->index, ce, &st, 0))
-+ if (err) {
-+ if (errno != ENOENT && errno != ENOTDIR)
-+ error_errno("cannot lstat '%s'", fullname.buf);
-+ if (show_deleted)
-+ show_ce(repo, dir, ce, fullname.buf, tag_removed);
-+ if (show_modified)
+- show_ce(repo, dir, ce, fullname.buf, tag_modified);
++ if (show_modified &&
++ (stat_err || ie_modified(repo->index, ce, &st, 0)))
+ show_ce(repo, dir, ce, fullname.buf, tag_modified);
-+ } else if (show_modified && ie_modified(repo->index, ce, &st, 0))
- show_ce(repo, dir, ce, fullname.buf, tag_modified);
}
}
+
2: 802ff802be8 ! 2: 3997d390883 ls_files.c: consolidate two for loops into one
@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_s
- if (show_cached || show_stage) {
- for (i = 0; i < repo->index->cache_nr; i++) {
- const struct cache_entry *ce = repo->index->cache[i];
-+ if (! (show_cached || show_stage || show_deleted || show_modified))
-+ return;
-+ for (i = 0; i < repo->index->cache_nr; i++) {
-+ const struct cache_entry *ce = repo->index->cache[i];
-+ struct stat st;
-+ int err;
-
+-
- construct_fullname(&fullname, repo, ce);
-+ construct_fullname(&fullname, repo, ce);
-
+-
- if ((dir->flags & DIR_SHOW_IGNORED) &&
- !ce_excluded(dir, repo->index, fullname.buf, ce))
- continue;
@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_s
- ce_stage(ce) ? tag_unmerged :
- (ce_skip_worktree(ce) ? tag_skip_worktree :
- tag_cached));
-+ if ((dir->flags & DIR_SHOW_IGNORED) &&
-+ !ce_excluded(dir, repo->index, fullname.buf, ce))
-+ continue;
-+ if (ce->ce_flags & CE_UPDATE)
-+ continue;
-+ if (show_cached || show_stage) {
-+ if (!show_unmerged || ce_stage(ce))
-+ show_ce(repo, dir, ce, fullname.buf,
-+ ce_stage(ce) ? tag_unmerged :
-+ (ce_skip_worktree(ce) ? tag_skip_worktree :
-+ tag_cached));
- }
+- }
- }
- if (show_deleted || show_modified) {
- for (i = 0; i < repo->index->cache_nr; i++) {
- const struct cache_entry *ce = repo->index->cache[i];
- struct stat st;
-- int err;
--
+- int stat_err;
++ if (! (show_cached || show_stage || show_deleted || show_modified))
++ return;
++ for (i = 0; i < repo->index->cache_nr; i++) {
++ const struct cache_entry *ce = repo->index->cache[i];
++ struct stat st;
++ int stat_err;
+
- construct_fullname(&fullname, repo, ce);
--
++ construct_fullname(&fullname, repo, ce);
+
- if ((dir->flags & DIR_SHOW_IGNORED) &&
- !ce_excluded(dir, repo->index, fullname.buf, ce))
- continue;
@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_s
- continue;
- if (ce_skip_worktree(ce))
- continue;
-- err = lstat(fullname.buf, &st);
-- if (err) {
-- if (errno != ENOENT && errno != ENOTDIR)
-- error_errno("cannot lstat '%s'", fullname.buf);
-- if (show_deleted)
-- show_ce(repo, dir, ce, fullname.buf, tag_removed);
-- if (show_modified)
+- stat_err = lstat(fullname.buf, &st);
+- if (stat_err && (errno != ENOENT && errno != ENOTDIR))
+- error_errno("cannot lstat '%s'", fullname.buf);
+- if (stat_err && show_deleted)
+- show_ce(repo, dir, ce, fullname.buf, tag_removed);
+- if (show_modified &&
+- (stat_err || ie_modified(repo->index, ce, &st, 0)))
- show_ce(repo, dir, ce, fullname.buf, tag_modified);
-- } else if (show_modified && ie_modified(repo->index, ce, &st, 0))
++ if ((dir->flags & DIR_SHOW_IGNORED) &&
++ !ce_excluded(dir, repo->index, fullname.buf, ce))
++ continue;
++ if (ce->ce_flags & CE_UPDATE)
++ continue;
++ if (show_cached || show_stage) {
++ if (!show_unmerged || ce_stage(ce))
++ show_ce(repo, dir, ce, fullname.buf,
++ ce_stage(ce) ? tag_unmerged :
++ (ce_skip_worktree(ce) ? tag_skip_worktree :
++ tag_cached));
+ }
++ if (!show_deleted && !show_modified)
++ continue;
+ if (ce_skip_worktree(ce))
+ continue;
-+ err = lstat(fullname.buf, &st);
-+ if (err) {
-+ if (errno != ENOENT && errno != ENOTDIR)
-+ error_errno("cannot lstat '%s'", fullname.buf);
-+ if (show_deleted)
-+ show_ce(repo, dir, ce, fullname.buf, tag_removed);
-+ if (show_modified)
- show_ce(repo, dir, ce, fullname.buf, tag_modified);
-- }
-+ } else if (show_modified && ie_modified(repo->index, ce, &st, 0))
-+ show_ce(repo, dir, ce, fullname.buf, tag_modified);
++ stat_err = lstat(fullname.buf, &st);
++ if (stat_err && (errno != ENOENT && errno != ENOTDIR))
++ error_errno("cannot lstat '%s'", fullname.buf);
++ if (stat_err && show_deleted)
++ show_ce(repo, dir, ce, fullname.buf, tag_removed);
++ if (show_modified &&
++ (stat_err || ie_modified(repo->index, ce, &st, 0)))
++ show_ce(repo, dir, ce, fullname.buf, tag_modified);
}
strbuf_release(&fullname);
3: e9c53186706 ! 3: 07b603fd97c ls-files.c: add --deduplicate option
@@ builtin/ls-files.c: static int line_terminator = '\n';
static const char *prefix;
static int max_prefix_len;
@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_struct *dir)
- {
- int i;
- struct strbuf fullname = STRBUF_INIT;
-+ const struct cache_entry *last_shown_ce;
-
- /* For cached/deleted files we don't need to even do the readdir */
- if (show_others || show_killed) {
-@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_struct *dir)
- }
- if (! (show_cached || show_stage || show_deleted || show_modified))
- return;
-+ last_shown_ce = NULL;
- for (i = 0; i < repo->index->cache_nr; i++) {
- const struct cache_entry *ce = repo->index->cache[i];
- struct stat st;
-@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_struct *dir)
-
- construct_fullname(&fullname, repo, ce);
-
-+ if (skipping_duplicates && last_shown_ce &&
-+ !strcmp(last_shown_ce->name,ce->name))
-+ continue;
- if ((dir->flags & DIR_SHOW_IGNORED) &&
- !ce_excluded(dir, repo->index, fullname.buf, ce))
continue;
if (ce->ce_flags & CE_UPDATE)
continue;
- if (show_cached || show_stage) {
-+ if (skipping_duplicates && last_shown_ce &&
-+ !strcmp(last_shown_ce->name,ce->name))
-+ continue;
- if (!show_unmerged || ce_stage(ce))
+- if (show_cached || show_stage) {
+- if (!show_unmerged || ce_stage(ce))
++ if ((show_cached || show_stage) &&
++ (!show_unmerged || ce_stage(ce))) {
show_ce(repo, dir, ce, fullname.buf,
ce_stage(ce) ? tag_unmerged :
(ce_skip_worktree(ce) ? tag_skip_worktree :
tag_cached));
-+ if (show_cached && skipping_duplicates)
-+ last_shown_ce = ce;
++ if (skipping_duplicates)
++ goto skip_to_next_name;
}
- if (ce_skip_worktree(ce))
+ if (!show_deleted && !show_modified)
continue;
-+ if (skipping_duplicates && last_shown_ce &&
-+ !strcmp(last_shown_ce->name,ce->name))
-+ continue;
- err = lstat(fullname.buf, &st);
- if (err) {
-- if (errno != ENOENT && errno != ENOTDIR)
-- error_errno("cannot lstat '%s'", fullname.buf);
-- if (show_deleted)
-+ if (skipping_duplicates && show_deleted && show_modified)
- show_ce(repo, dir, ce, fullname.buf, tag_removed);
-- if (show_modified)
-- show_ce(repo, dir, ce, fullname.buf, tag_modified);
-+ else {
-+ if (errno != ENOENT && errno != ENOTDIR)
-+ error_errno("cannot lstat '%s'", fullname.buf);
-+ if (show_deleted)
-+ show_ce(repo, dir, ce, fullname.buf, tag_removed);
-+ if (show_modified)
-+ show_ce(repo, dir, ce, fullname.buf, tag_modified);
-+ }
- } else if (show_modified && ie_modified(repo->index, ce, &st, 0))
- show_ce(repo, dir, ce, fullname.buf, tag_modified);
-+ last_shown_ce = ce;
+@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_struct *dir)
+ stat_err = lstat(fullname.buf, &st);
+ if (stat_err && (errno != ENOENT && errno != ENOTDIR))
+ error_errno("cannot lstat '%s'", fullname.buf);
+- if (stat_err && show_deleted)
++ if (stat_err && show_deleted) {
+ show_ce(repo, dir, ce, fullname.buf, tag_removed);
++ if (skipping_duplicates)
++ goto skip_to_next_name;
++ }
+ if (show_modified &&
+- (stat_err || ie_modified(repo->index, ce, &st, 0)))
++ (stat_err || ie_modified(repo->index, ce, &st, 0))) {
+ show_ce(repo, dir, ce, fullname.buf, tag_modified);
++ if (skipping_duplicates)
++ goto skip_to_next_name;
++ }
++ continue;
++skip_to_next_name:
++ {
++ int j;
++ struct cache_entry **cache = repo->index->cache;
++ for (j = i + 1; j < repo->index->cache_nr; j++)
++ if (strcmp(ce->name, cache[j]->name))
++ break;
++ i = j - 1; /* compensate for outer for loop */
++ }
}
strbuf_release(&fullname);
--
gitgitgadget
next prev parent reply other threads:[~2021-01-23 10:21 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 ` 阿德烈 via GitGitGadget [this message]
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 ` [PATCH v7 0/3] builtin/ls-files.c:add git ls-file --dedup option 阿德烈 via GitGitGadget
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.v6.git.1611397210.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.