From: Junio C Hamano <gitster@pobox.com>
To: "ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com>
Cc: git@vger.kernel.org,
"Christian Couder" <christian.couder@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Phillip Wood" <phillip.wood123@gmail.com>,
"Torsten Bögershausen" <tboegi@web.de>,
"ZheNing Hu" <adlternative@gmail.com>
Subject: Re: [PATCH v8] ls-files: introduce "--format" option
Date: Wed, 20 Jul 2022 10:37:40 -0700 [thread overview]
Message-ID: <xmqqbktj3ct7.fsf@gitster.g> (raw)
In-Reply-To: <pull.1262.v8.git.1658334983053.gitgitgadget@gmail.com> (ZheNing Hu via GitGitGadget's message of "Wed, 20 Jul 2022 16:36:22 +0000")
"ZheNing Hu via GitGitGadget" <gitgitgadget@gmail.com> writes:
It's been quite many iterations, so I'll just comment on the range-diff.
> -+ usage_msg_opt("--format cannot used with -s, -o, -k, -t"
> ++ usage_msg_opt("--format cannot used with -s, -o, -k, -t, "
> + "--resolve-undo, --deduplicate, --eol",
> + ls_files_usage, builtin_ls_files_options);
Looks good.
> @@ t/t3013-ls-files-format.sh (new)
> + printf "LINEONE\nLINETWO\nLINETHREE\n" >o1.txt &&
> + printf "LINEONE\r\nLINETWO\r\nLINETHREE\r\n" >o2.txt &&
> + printf "LINEONE\r\nLINETWO\nLINETHREE\n" >o3.txt &&
> -+ ln -s o3.txt o4.txt &&
> -+ git add "*.txt" &&
> -+ git add --chmod +x o1.txt &&
> -+ git update-index --add --cacheinfo 160000 $(git hash-object o1.txt) o5.txt &&
> ++ git add . &&
We may want to be a bit more strict (like "o?.txt") but because we
know this is the first 'setup' step, let's let it pass.
> ++ oid=$(git hash-object o1.txt) &&
> ++ git update-index --add --cacheinfo 120000 $oid o4.txt &&
> ++ git update-index --add --cacheinfo 160000 $oid o5.txt &&
> ++ git update-index --add --cacheinfo 100755 $oid o6.txt &&
It is a bit inconvenient that --cacheinfo takes only fully-spelled
raw object name that we need to use $oid like this (otherwise we
would be able to write ":o1.txt" instead), but (1) it is not a fault
of this patch, and (2) update-index is a plumbing command meant for
scripts, so it is not too big a problem.
> + git commit -m base
> +'
> +
> +test_expect_success 'git ls-files --format objectmode v.s. -s' '
> -+ git ls-files -s | awk "{print \$1}" >expect &&
> ++ git ls-files -s >files &&
> ++ cut -d" " -f1 files >expect &&
Either "awk" or "cut" is fine and flipping between them is a bit
distracting. Cutting the pipe into two is a good move.
But is this testing the right thing?
> +test_expect_success 'git ls-files --format objectmode v.s. -s' '
> + git ls-files -s >files &&
> + cut -d" " -f1 files >expect &&
> + git ls-files --format="%(objectmode)" >actual &&
> + test_cmp expect actual
> +'
It only looks at the first column of the "-s" output, and we are
implicitly assuming that the order of output does not change between
the "-s" output and "--format=<format>" output. I wonder if it is
more useful and less error prone to come up with a format string
that 100% reproduces the "ls-files -s" output and compare the two,
e.g.
format="%(objectmode) %(objectname) %(stage) %(path)" &&
git ls-files -s >expect &&
git ls-files --format="$format" >actual &&
test_cmp expect actual
I do not know if the $format I wrote without looking at the doc is
correct, but you get the idea.
Thanks.
next prev parent reply other threads:[~2022-07-20 17:38 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-15 13:45 [PATCH 0/2] ls-files: introduce "--format" and "--object-only" options ZheNing Hu via GitGitGadget
2022-06-15 13:45 ` [PATCH 1/2] ls-files: introduce "--format" option ZheNing Hu via GitGitGadget
2022-06-15 20:07 ` Ævar Arnfjörð Bjarmason
2022-06-18 10:50 ` ZheNing Hu
2022-06-15 13:45 ` [PATCH 2/2] ls-files: introduce "--object-only" option ZheNing Hu via GitGitGadget
2022-06-15 20:15 ` Ævar Arnfjörð Bjarmason
2022-06-18 10:59 ` ZheNing Hu
2022-06-19 9:13 ` [PATCH v2] ls-files: introduce "--format" option ZheNing Hu via GitGitGadget
2022-06-19 13:50 ` Phillip Wood
2022-06-20 13:32 ` ZheNing Hu
2022-06-21 2:05 ` [PATCH v3] " ZheNing Hu via GitGitGadget
2022-06-23 14:06 ` Phillip Wood
2022-06-23 15:57 ` Junio C Hamano
2022-06-24 10:16 ` Phillip Wood
2022-06-26 13:05 ` ZheNing Hu
2022-06-24 13:20 ` Ævar Arnfjörð Bjarmason
2022-06-24 15:28 ` Junio C Hamano
2022-06-26 13:01 ` ZheNing Hu
2022-06-24 13:25 ` Ævar Arnfjörð Bjarmason
2022-06-24 15:33 ` Junio C Hamano
2022-06-26 13:35 ` ZheNing Hu
2022-06-27 8:22 ` Junio C Hamano
2022-06-27 11:06 ` ZheNing Hu
2022-06-27 15:41 ` Junio C Hamano
2022-07-01 13:30 ` ZheNing Hu
2022-06-26 13:34 ` ZheNing Hu
2022-06-26 15:29 ` [PATCH v4] " ZheNing Hu via GitGitGadget
2022-06-27 8:32 ` Junio C Hamano
2022-06-27 11:18 ` ZheNing Hu
2022-06-27 18:34 ` Ævar Arnfjörð Bjarmason
2022-07-01 12:42 ` ZheNing Hu
2022-06-28 15:19 ` Phillip Wood
2022-07-01 12:47 ` ZheNing Hu
2022-07-05 6:32 ` [PATCH v5] " ZheNing Hu via GitGitGadget
2022-07-05 8:39 ` Ævar Arnfjörð Bjarmason
2022-07-11 15:14 ` ZheNing Hu
2022-07-05 19:28 ` Torsten Bögershausen
2022-07-11 15:27 ` ZheNing Hu
2022-07-11 16:53 ` [PATCH v6] " ZheNing Hu via GitGitGadget
2022-07-11 22:11 ` Junio C Hamano
2022-07-12 13:53 ` ZheNing Hu
2022-07-12 14:34 ` Junio C Hamano
2022-07-13 6:07 ` [PATCH v7] " ZheNing Hu via GitGitGadget
2022-07-18 8:09 ` Ævar Arnfjörð Bjarmason
2022-07-19 16:19 ` ZheNing Hu
2022-07-19 16:47 ` Junio C Hamano
2022-07-19 17:21 ` ZheNing Hu
2022-07-20 16:36 ` [PATCH v8] " ZheNing Hu via GitGitGadget
2022-07-20 17:37 ` Junio C Hamano [this message]
2022-07-21 15:54 ` Ævar Arnfjörð Bjarmason
2022-07-21 17:22 ` Eric Sunshine
2022-07-21 17:23 ` Junio C Hamano
2022-07-22 6:44 ` ZheNing Hu
2022-07-23 18:40 ` Junio C Hamano
2022-07-23 18:46 ` Junio C Hamano
2022-07-24 11:08 ` ZheNing Hu
2022-07-25 1:03 ` Junio C Hamano
2022-07-25 11:00 ` ZheNing Hu
2022-07-23 6:44 ` [PATCH v9] " ZheNing Hu via GitGitGadget
2022-09-08 2:01 ` Jiang Xin
2022-09-11 11:01 ` ZheNing Hu
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqbktj3ct7.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=adlternative@gmail.com \
--cc=avarab@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=phillip.wood123@gmail.com \
--cc=tboegi@web.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).