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>,
阿德烈 <adlternative@gmail.com>
Subject: [PATCH v5 0/3] builtin/ls-files.c:add git ls-file --dedup option
Date: Tue, 19 Jan 2021 06:30:43 +0000 [thread overview]
Message-ID: <pull.832.v5.git.1611037846.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.832.v4.git.1610856136.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 | 83 ++++++++++++++++++++--------------
t/t3012-ls-files-dedup.sh | 66 +++++++++++++++++++++++++++
3 files changed, 120 insertions(+), 34 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-v5
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-832/adlternative/ls-files-dedup-v5
Pull-Request: https://github.com/gitgitgadget/git/pull/832
Range-diff vs v4:
1: f4d9af8a312 ! 1: ec9464f6094 ls_files.c: bugfix for --deleted and --modified
@@ Commit message
This situation may occur in the original code: lstat() failed
but we use `&st` to feed ie_modified() later.
- It's buggy!
-
Therefore, we can directly execute show_ce without the judgment of
ie_modified() when lstat() has failed.
@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_s
- show_ce(repo, dir, ce, fullname.buf, tag_removed);
- if (show_modified && ie_modified(repo->index, ce, &st, 0))
+ if (err) {
-+ 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))
++ 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);
}
}
2: 50efd9b45b1 ! 2: 802ff802be8 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;
-+ 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
- continue;
- err = lstat(fullname.buf, &st);
- if (err) {
-- 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);
-+ 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 (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))
+ if (ce_skip_worktree(ce))
+ continue;
+ err = lstat(fullname.buf, &st);
+ if (err) {
-+ 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))
++ 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);
}
3: 0c7830d07db ! 3: e9c53186706 ls-files: add --deduplicate option
@@ Metadata
Author: ZheNing Hu <adlternative@gmail.com>
## Commit message ##
- ls-files: add --deduplicate option
+ ls-files.c: add --deduplicate option
In order to provide users a better experience
when viewing information about files in the index
@@ builtin/ls-files.c: static void show_files(struct repository *repo, struct dir_s
if (ce->ce_flags & CE_UPDATE)
continue;
if (show_cached || show_stage) {
-+ if (show_cached && skipping_duplicates && last_shown_ce &&
++ if (skipping_duplicates && last_shown_ce &&
+ !strcmp(last_shown_ce->name,ce->name))
+ continue;
if (!show_unmerged || ce_stage(ce))
@@ 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(show_cached && skipping_duplicates)
++ if (show_cached && skipping_duplicates)
+ last_shown_ce = ce;
}
if (ce_skip_worktree(ce))
continue;
-+ if (skipping_duplicates && last_shown_ce && !strcmp(last_shown_ce->name,ce->name))
-+ 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);
+ show_ce(repo, dir, ce, fullname.buf, tag_removed);
+- if (show_modified)
+- show_ce(repo, dir, ce, fullname.buf, tag_modified);
+ else {
- 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))
++ 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))
+ } 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: int cmd_ls_files(int argc, const char **argv, const char *cm
};
@@ builtin/ls-files.c: int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
- tag_skip_worktree = "S ";
- tag_resolve_undo = "U ";
- }
-+ if (show_tag && skipping_duplicates)
+ * you also show the stage information.
+ */
+ show_stage = 1;
++ if (show_tag || show_stage)
+ skipping_duplicates = 0;
- if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed)
- require_work_tree = 1;
- if (show_unmerged)
+ if (dir.exclude_per_dir)
+ exc_given = 1;
+
## t/t3012-ls-files-dedup.sh (new) ##
@@
@@ t/t3012-ls-files-dedup.sh (new)
+ >b.txt &&
+ >delete.txt &&
+ git add a.txt b.txt delete.txt &&
-+ git commit -m master:1 &&
++ git commit -m base &&
+ echo a >a.txt &&
+ echo b >b.txt &&
+ echo delete >delete.txt &&
+ git add a.txt b.txt delete.txt &&
-+ git commit -m master:2 &&
-+ git checkout HEAD~ &&
-+ git switch -c dev &&
-+ test_when_finished "git switch master" &&
++ git commit -m tip &&
++ git tag tip &&
++ git reset --hard HEAD^ &&
+ echo change >a.txt &&
-+ git add a.txt &&
-+ git commit -m dev:1 &&
-+ test_must_fail git merge master &&
++ git commit -a -m side &&
++ git tag side
++'
++
++test_expect_success 'git ls-files --deduplicate to show unique unmerged path' '
++ test_must_fail git merge tip &&
+ git ls-files --deduplicate >actual &&
+ cat >expect <<-\EOF &&
+ a.txt
@@ t/t3012-ls-files-dedup.sh (new)
+ delete.txt
+ EOF
+ test_cmp expect actual &&
++ git merge --abort
++'
++
++test_expect_success 'git ls-files -d -m --deduplicate with different display options' '
++ git reset --hard side &&
++ test_must_fail git merge tip &&
+ rm delete.txt &&
+ git ls-files -d -m --deduplicate >actual &&
+ cat >expect <<-\EOF &&
@@ t/t3012-ls-files-dedup.sh (new)
+ delete.txt
+ EOF
+ test_cmp expect actual &&
-+ git ls-files -d -m -t --deduplicate >actual &&
++ git ls-files -d -m -t --deduplicate >actual &&
+ cat >expect <<-\EOF &&
+ C a.txt
+ C a.txt
@@ t/t3012-ls-files-dedup.sh (new)
+ C delete.txt
+ EOF
+ test_cmp expect actual &&
-+ git ls-files -d -m -c --deduplicate >actual &&
++ git ls-files -d -m -c --deduplicate >actual &&
+ cat >expect <<-\EOF &&
+ a.txt
+ b.txt
@@ t/t3012-ls-files-dedup.sh (new)
+ test_cmp expect actual &&
+ git merge --abort
+'
++
+test_done
--
gitgitgadget
next prev parent reply other threads:[~2021-01-19 6:32 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 ` 阿德烈 via GitGitGadget [this message]
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 ` [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.v5.git.1611037846.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--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).