Page MenuHomeSoftware Heritage

git_bare: Don't cook submodule targets
ClosedPublic

Authored by vlorentz on Mon, Sep 6, 5:25 PM.

Details

Summary

gi-fsck (rightly) does not accept them.

Resolves T3553.

Depends on D6195.

Diff Detail

Repository
rDVAU Software Heritage Vault
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

Build is green

Patch application report for D6196 (id=22425)

Could not rebase; Attempt merge onto 170fcfbc7a...

Updating 170fcfb..c7ec62b
Fast-forward
 swh/vault/cookers/git_bare.py   |  7 +++---
 swh/vault/tests/test_cookers.py | 47 +++++++++++++++++++++++++++++------------
 2 files changed, 37 insertions(+), 17 deletions(-)
Changes applied before test
commit c7ec62bb51d58c2c755e46bbf0a3dffa01c2aa25
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Sep 6 17:25:16 2021 +0200

    git_bare: Don't cook submodule targets
    
    gi-fsck (rightly) does not accept them.

commit cbaea9f2f20f425dd09e7ade2dcd2ce5f99a501c
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Sep 6 17:22:33 2021 +0200

    Generalize test_revision_submodule to run on the git_bare cooker.

See https://jenkins.softwareheritage.org/job/DVAU/job/tests-on-diff/176/ for more details.

anlambert added inline comments.
swh/vault/cookers/git_bare.py
521

could you add a comment explaining why the rev entry is None ?

swh/vault/tests/test_cookers.py
1026

Is is possible to check if the target_rev revision got cooked based on the ingest_target_revision value ?

swh/vault/tests/test_cookers.py
1026

The test always runs git-fsck; and the only point of this change is to make git-fsck happy. So I think that's good enough.

anlambert added inline comments.
swh/vault/tests/test_cookers.py
1026

Ok, looks good then.

This revision is now accepted and ready to land.Tue, Sep 7, 11:34 AM

Build is green

Patch application report for D6196 (id=22440)

Could not rebase; Attempt merge onto 170fcfbc7a...

Updating 170fcfb..e141c56
Fast-forward
 swh/vault/cookers/git_bare.py   |  7 +++---
 swh/vault/tests/test_cookers.py | 47 +++++++++++++++++++++++++++++------------
 2 files changed, 37 insertions(+), 17 deletions(-)
Changes applied before test
commit e141c56d702e0f392cf5ed0020a65e238cf68e8f
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Sep 6 17:25:16 2021 +0200

    git_bare: Don't cook submodule targets
    
    gi-fsck (rightly) does not accept them.

commit cbaea9f2f20f425dd09e7ade2dcd2ce5f99a501c
Author: Valentin Lorentz <vlorentz@softwareheritage.org>
Date:   Mon Sep 6 17:22:33 2021 +0200

    Generalize test_revision_submodule to run on the git_bare cooker.

See https://jenkins.softwareheritage.org/job/DVAU/job/tests-on-diff/177/ for more details.

This revision was automatically updated to reflect the committed changes.