undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t7421: eliminate 'grep' check in t7421.4 for mingw compatibility

Browse Source 
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_abbrev' by guarding the
'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. The same need not be implemented for 'dst_abbrev' and is
rather redundant since the conditional 'if (S_ISGITLINK(p->mod_dst))'
already guards the 'verify_submodule_committish()' when we have a
status of 'D'.

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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Shourya Shukla 2020-08-27 23:15:01 +05:30 committed by Junio C Hamano
parent f0c6b6467d
commit d79b145569
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
builtin/submodule--helper.c
View File

@ -1035,7 +1035,7 @@ static void print_submodule_summary(struct summary_cb *info, char *errmsg,
static void generate_submodule_summary(struct summary_cb *info, static void generate_submodule_summary(struct summary_cb *info,
struct module_cb *p) struct module_cb *p)
{ {
char *displaypath, *src_abbrev, *dst_abbrev; char *displaypath, *src_abbrev = NULL, *dst_abbrev;
int missing_src = 0, missing_dst = 0; int missing_src = 0, missing_dst = 0;
char *errmsg = NULL; char *errmsg = NULL;
int total_commits = -1; int total_commits = -1;
@ -1061,8 +1061,9 @@ static void generate_submodule_summary(struct summary_cb *info,
} }
if (S_ISGITLINK(p->mod_src)) { if (S_ISGITLINK(p->mod_src)) {
src_abbrev = verify_submodule_committish(p->sm_path, if (p->status != 'D')
oid_to_hex(&p->oid_src)); src_abbrev = verify_submodule_committish(p->sm_path,
oid_to_hex(&p->oid_src));
if (!src_abbrev) { if (!src_abbrev) {
missing_src = 1; missing_src = 1;
/* /*

2
t/t7421-submodule-summary-add.sh
View File

@ -58,7 +58,7 @@ test_expect_success 'submodule summary output for submodules with changed paths'
git commit -m "change submodule path" && git commit -m "change submodule path" &&
rev=$(git -C sm rev-parse --short HEAD^) && rev=$(git -C sm rev-parse --short HEAD^) &&
git submodule summary HEAD^^ -- my-subm >actual 2>err && git submodule summary HEAD^^ -- my-subm >actual 2>err &&
grep "fatal:.*my-subm" err && test_must_be_empty err &&
cat >expected <<-EOF && cat >expected <<-EOF &&
* my-subm ${rev}...0000000: * my-subm ${rev}...0000000: