From: ZheNing Hu <adlternative@gmail.com>
To: git@vger.kernel.org
Cc: felipe.contreras@gmail.com, ZheNing Hu <adlternative@gmail.com>
Subject: [PATCH] builtin/ls-files.c:add git ls-file --dedup option
Date: Tue, 5 Jan 2021 13:39:46 +0800 [thread overview]
Message-ID: <20210105053946.710743-2-adlternative@gmail.com> (raw)
In-Reply-To: <20210105053946.710743-1-adlternative@gmail.com>
1.When we use git ls-files with both -m -d,
we would find that repeated path,sometimes
it is confusing.
2.When we are performing a branch merge,
the default git ls-files will also output
multiple repeated file names.
Therefore, I added the --dedup option to git ls-files.
1. It can be achieved that only the deleted file name
is displayed when using -m, -d, and --dedup at the same time.
2. Add --dedup when merging branches to remove duplicate file
names. (unless -s, -u are used)
Signed-off-by: ZheNing Hu <adlternative@gmail.com>
---
builtin/ls-files.c | 43 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index c8eae899b8..66a7e251a4 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -35,6 +35,7 @@ static int line_terminator = '\n';
static int debug_mode;
static int show_eol;
static int recurse_submodules;
+static int delete_dup;
static const char *prefix;
static int max_prefix_len;
@@ -301,6 +302,7 @@ static void show_files(struct repository *repo, struct dir_struct *dir)
{
int i;
struct strbuf fullname = STRBUF_INIT;
+ const struct cache_entry *last_stage=NULL;
/* For cached/deleted files we don't need to even do the readdir */
if (show_others || show_killed) {
@@ -315,7 +317,20 @@ static void show_files(struct repository *repo, struct dir_struct *dir)
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 && delete_dup){
+ switch (ce_stage(ce)) {
+ case 0:
+ default:
+ break;
+ case 1:
+ case 2:
+ case 3:
+ if (last_stage &&
+ !strcmp(last_stage->name, ce->name))
+ continue;
+ last_stage=ce;
+ }
+ }
construct_fullname(&fullname, repo, ce);
if ((dir->flags & DIR_SHOW_IGNORED) &&
@@ -336,7 +351,20 @@ static void show_files(struct repository *repo, struct dir_struct *dir)
const struct cache_entry *ce = repo->index->cache[i];
struct stat st;
int err;
-
+ if(delete_dup){
+ switch (ce_stage(ce)) {
+ case 0:
+ default:
+ break;
+ case 1:
+ case 2:
+ case 3:
+ if (last_stage &&
+ !strcmp(last_stage->name, ce->name))
+ continue;
+ last_stage=ce;
+ }
+ }
construct_fullname(&fullname, repo, ce);
if ((dir->flags & DIR_SHOW_IGNORED) &&
@@ -347,10 +375,14 @@ static void show_files(struct repository *repo, struct dir_struct *dir)
if (ce_skip_worktree(ce))
continue;
err = lstat(fullname.buf, &st);
- if (show_deleted && err)
+ if(delete_dup && show_deleted && show_modified && err)
show_ce(repo, dir, ce, fullname.buf, tag_removed);
- if (show_modified && ie_modified(repo->index, ce, &st, 0))
- show_ce(repo, dir, ce, fullname.buf, tag_modified);
+ else{
+ if (show_deleted && err)/* you can't find it,so it's actually removed at all! */
+ show_ce(repo, dir, ce, fullname.buf, tag_removed);
+ if (show_modified && ie_modified(repo->index, ce, &st, 0))
+ show_ce(repo, dir, ce, fullname.buf, tag_modified);
+ }
}
}
@@ -578,6 +610,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
N_("pretend that paths removed since <tree-ish> are still present")),
OPT__ABBREV(&abbrev),
OPT_BOOL(0, "debug", &debug_mode, N_("show debugging data")),
+ OPT_BOOL(0, "dedup", &delete_dup, N_("delete duplicate entry in index")),
OPT_END()
};
--
2.30.0
next prev parent reply other threads:[~2021-01-05 5:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-05 5:39 [PATCH v1 1/1] builtin/ls-files.c:add git ls-file --dedup option ZheNing Hu
2021-01-05 5:39 ` ZheNing Hu [this message]
2021-01-06 8:53 [PATCH] " 阿德烈 via GitGitGadget
2021-01-07 6:10 ` Eric Sunshine
2021-01-07 6:40 ` Junio C Hamano
2021-01-07 6:58 胡哲宁
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=20210105053946.710743-2-adlternative@gmail.com \
--to=adlternative@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
/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).