From: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
To: Shourya Shukla <shouryashukla.oo@gmail.com>
Cc: git@vger.kernel.org, gitster@pobox.com,
christian.couder@gmail.com, Johannes.Schindelin@gmx.de,
peff@peff.net, liu.denton@gmail.com,
Christian Couder <chriscool@tuxfamily.org>
Subject: Re: [PATCH 3/3] t7421: eliminate 'grep' check in t7421.4 for mingw compatibility
Date: Tue, 25 Aug 2020 20:03:24 +0530 [thread overview]
Message-ID: <2a1ea501-4974-4d74-fe3c-d173bbe76855@gmail.com> (raw)
In-Reply-To: <20200825113020.71801-4-shouryashukla.oo@gmail.com>
On 25-08-2020 17:00, Shourya Shukla wrote:
> The 'grep' check in test 4 of t7421 resulted in the failure of t7421 on
> Windows due to a different error message
>
> error: cannot spawn git: No such file or directory
>
> instead of
>
> fatal: exec 'rev-parse': cd to 'my-subm' failed: No such file or directory
>
> Tighten up the check to compute '{src,dst}_abbrev' by guarding the
The change only affects `src_abbrev`. So, it's misleading to mention
`dst_abbrev` here.
> 'verify_submodule_committish()' call using `p->status !='D'`, so that
> the former isn't called in case of non-existent submodule directory,
> consequently, there is no such error message on any execution
> environment.
>
> Therefore, eliminate the 'grep' check in t7421. Instead, verify the
> absence of an error message by doing a 'test_must_be_empty' on the
> file containing the error.
>
> Reported-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> Helped-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
> Mentored-by: Christian Couder <chriscool@tuxfamily.org>
> Mentored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com>
> Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com>
> ---
> builtin/submodule--helper.c | 7 ++++---
> t/t7421-submodule-summary-add.sh | 2 +-
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
> index 93d0700891..f1951680f7 100644
> --- a/builtin/submodule--helper.c
> +++ b/builtin/submodule--helper.c
> @@ -1035,7 +1035,7 @@ static void print_submodule_summary(struct summary_cb *info, char *errmsg,
> static void generate_submodule_summary(struct summary_cb *info,
> struct module_cb *p)
> {
> - char *displaypath, *src_abbrev, *dst_abbrev;
> + char *displaypath, *src_abbrev = NULL, *dst_abbrev = NULL;
Unlike `src_abbrev`, I don't think we need to initilialize `dst_abbrev`
to NULL here as it would be assigned in all code paths.
> int missing_src = 0, missing_dst = 0;
> char *errmsg = NULL;
> int total_commits = -1;
> @@ -1061,8 +1061,9 @@ static void generate_submodule_summary(struct summary_cb *info,
> }
>
> if (S_ISGITLINK(p->mod_src)) {
> - src_abbrev = verify_submodule_committish(p->sm_path,
> - oid_to_hex(&p->oid_src));
> + if (p->status != 'D')
> + src_abbrev = verify_submodule_committish(p->sm_path,
> + oid_to_hex(&p->oid_src));
> if (!src_abbrev) {
> missing_src = 1;
> /*
--
Sivaraam
next prev parent reply other threads:[~2020-08-25 14:33 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 11:30 [GSoC][PATCH 0/3] submodule: fixup to summary-v3 Shourya Shukla
2020-08-25 11:30 ` [PATCH 1/3] submodule: eliminate unused parameters from print_submodule_summary() Shourya Shukla
2020-08-25 11:30 ` [PATCH 2/3] submodule: fix style in function definition Shourya Shukla
2020-08-25 20:45 ` Junio C Hamano
2020-08-26 9:45 ` Shourya Shukla
2020-08-26 16:47 ` Junio C Hamano
2020-08-25 11:30 ` [PATCH 3/3] t7421: eliminate 'grep' check in t7421.4 for mingw compatibility Shourya Shukla
2020-08-25 14:33 ` Kaartic Sivaraam [this message]
2020-08-25 16:10 ` Junio C Hamano
2020-08-27 9:14 ` Shourya Shukla
2020-08-26 10:40 ` Shourya Shukla
2020-08-25 14:38 ` [GSoC][PATCH 0/3] submodule: fixup to summary-v3 Kaartic Sivaraam
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=2a1ea501-4974-4d74-fe3c-d173bbe76855@gmail.com \
--to=kaartic.sivaraam@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=chriscool@tuxfamily.org \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=liu.denton@gmail.com \
--cc=peff@peff.net \
--cc=shouryashukla.oo@gmail.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.
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).