Skip to content

commit-reach: pass repository to reachability helpers - #2393

Open
g-chauvel wants to merge 1 commit into
git:masterfrom
g-chauvel:submodule-commit-graph-repository
Open

commit-reach: pass repository to reachability helpers#2393
g-chauvel wants to merge 1 commit into
git:masterfrom
g-chauvel:submodule-commit-graph-repository

Conversation

@g-chauvel

Copy link
Copy Markdown

No description provided.

repo_is_descendant_of() accepts a repository, but its generation-number
fast path drops that context when it calls can_all_from_reach(). That helper
and can_all_from_reach_with_flag() consequently dereference tags and parse
commits with the_repository.

During a submodule merge, the commits being walked belong to the submodule
repository. If a submodule commit already has a commit-graph position,
parsing it against the_repository treats that position as an index into the
commit-graph of the superproject. This creates two failure modes:

  - An out-of-range position dies with "invalid commit position.
    commit-graph is likely corrupt".

  - An in-range position reads an unrelated row and can produce an
    incorrect reachability result.

Add a repository argument to both helpers and use it for tag dereferencing
and commit parsing. Pass the supplied repository from
repo_is_descendant_of(), and pass the_repository from callers whose objects
belong to the main repository.

Add submodule merge tests with valid commit-graphs in both repositories. A
small superproject graph covers the out-of-range case, while a larger graph
keeps every submodule position numerically in range and covers the incorrect
reachability case. In both cases, verify that the resulting gitlink points
at the descendant commit.

Assisted-by: GPT-5.6 Sol
Signed-off-by: Guillaume Chauvel <guillaume.chauvel@gmail.com>
@gitgitgadget-git

Copy link
Copy Markdown

Welcome to GitGitGadget

Hi @g-chauvel, and welcome to GitGitGadget, the GitHub App to send patch series to the Git mailing list from GitHub Pull Requests.

Please make sure that either:

  • Your Pull Request has a good description, if it consists of multiple commits, as it will be used as cover letter.
  • Your Pull Request description is empty, if it consists of a single commit, as the commit message should be descriptive enough by itself.

You can CC potential reviewers by adding a footer to the PR description with the following syntax:

CC: Revi Ewer <revi.ewer@example.com>, Ill Takalook <ill.takalook@example.net>

NOTE: DO NOT copy/paste your CC list from a previous GGG PR's description,
because it will result in a malformed CC list on the mailing list. See
example.

Also, it is a good idea to review the commit messages one last time, as the Git project expects them in a quite specific form:

  • the lines should not exceed 76 columns,
  • the first line should be like a header and typically start with a prefix like "tests:" or "revisions:" to state which subsystem the change is about, and
  • the commit messages' body should be describing the "why?" of the change.
  • Finally, the commit messages should end in a Signed-off-by: line matching the commits' author.

It is in general a good idea to await the automated test ("Checks") in this Pull Request before contributing the patches, e.g. to avoid trivial issues such as unportable code.

Contributing the patches

Before you can contribute the patches, your GitHub username needs to be added to the list of permitted users. Any already-permitted user can do that, by adding a comment to your PR of the form /allow. A good way to find other contributors is to locate recent pull requests where someone has been /allowed:

Both the person who commented /allow and the PR author are able to /allow you.

An alternative is the channel #git-devel on the Libera Chat IRC network:

<newcontributor> I've just created my first PR, could someone please /allow me? https://github.com/gitgitgadget/git/pull/12345
<veteran> newcontributor: it is done
<newcontributor> thanks!

Once on the list of permitted usernames, you can contribute the patches to the Git mailing list by adding a PR comment /submit.

If you want to see what email(s) would be sent for a /submit request, add a PR comment /preview to have the email(s) sent to you. You must have a public GitHub email address for this. Note that any reviewers CC'd via the list in the PR description will not actually be sent emails.

After you submit, GitGitGadget will respond with another comment that contains the link to the cover letter mail in the Git mailing list archive. Please make sure to monitor the discussion in that thread and to address comments and suggestions (while the comments and suggestions will be mirrored into the PR by GitGitGadget, you will still want to reply via mail).

If you do not want to subscribe to the Git mailing list just to be able to respond to a mail, you can download the mbox from the Git mailing list archive (click the (raw) link), then import it into your mail program. If you use GMail, you can do this via:

curl -g --user "<EMailAddress>:<Password>" \
    --url "imaps://imap.gmail.com/INBOX" -T /path/to/raw.txt

To iterate on your change, i.e. send a revised patch or patch series, you will first want to (force-)push to the same branch. You probably also want to modify your Pull Request description (or title). It is a good idea to summarize the revision by adding something like this to the cover letter (read: by editing the first comment on the PR, i.e. the PR description):

Changes since v1:
- Fixed a typo in the commit message (found by ...)
- Added a code comment to ... as suggested by ...
...

To send a new iteration, just add another PR comment with the contents: /submit.

Need help?

New contributors who want advice are encouraged to join git-mentoring@googlegroups.com, where volunteers who regularly contribute to Git are willing to answer newbie questions, give advice, or otherwise provide mentoring to interested contributors. You must join in order to post or view messages, but anyone can join.

You may also be able to find help in real time in the developer IRC channel, #git-devel on Libera Chat. Remember that IRC does not support offline messaging, so if you send someone a private message and log out, they cannot respond to you. The scrollback of #git-devel is archived, though.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant