diff: fix crash with --find-object outside repository

[mmontalbo]

No description provided.

[gitgitgadget]

Welcome to GitGitGadget

Hi @mmontalbo, 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:

• Search: is:pr is:open "/allow"

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.

[mmontalbo]

/preview

[gitgitgadget]

Error: User mmontalbo is not yet permitted to use GitGitGadget

[mmontalbo]

Hello @dscho @derrickstolee, this is my first contribution. May I please be /allowed to submit the change.

Thank you!

[Ikke]

/allow

[gitgitgadget]

User mmontalbo is now allowed to use GitGitGadget.

[mmontalbo]

/preview

[gitgitgadget]

Preview email sent as pull.2057.git.1772309933440.gitgitgadget@gmail.com

[mmontalbo]

/submit

[gitgitgadget]

Submitted as pull.2057.git.1772310676438.gitgitgadget@gmail.com

To fetch this version into FETCH_HEAD:

git fetch https://github.com/gitgitgadget/git/ pr-2057/mmontalbo/fix-find-object-crash-v1

To fetch this version to local tag pr-2057/mmontalbo/fix-find-object-crash-v1:

git fetch --no-tags https://github.com/gitgitgadget/git/ tag pr-2057/mmontalbo/fix-find-object-crash-v1

[gitgitgadget]

Junio C Hamano wrote on the Git mailing list (how to reply to this email):

"Michael Montalbo via GitGitGadget" <gitgitgadget@gmail.com> writes:

> From: Michael Montalbo <mmontalbo@gmail.com>
>
> When "git diff --find-object=<oid>" is run outside a git repository,
> the option parsing callback eagerly resolves the OID via
> repo_get_oid(), which reaches get_main_ref_store() and hits a BUG()
> assertion because no repository has been set up.
>
> Check startup_info->have_repository before attempting to resolve the
> OID, and return a user-friendly error instead.
>
> Signed-off-by: Michael Montalbo <mmontalbo@gmail.com>
> ---
>     diff: fix crash with --find-object outside repository
>
> Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-2057%2Fmmontalbo%2Ffix-find-object-crash-v1
> Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-2057/mmontalbo/fix-find-object-crash-v1
> Pull-Request: https://github.com/gitgitgadget/git/pull/2057
>
>  diff.c                   |  2 ++
>  t/t4053-diff-no-index.sh | 10 ++++++++++
>  2 files changed, 12 insertions(+)
>
> diff --git a/diff.c b/diff.c
> index a68ddd2168..8f0f141be7 100644
> --- a/diff.c
> +++ b/diff.c
> @@ -5215,6 +5215,8 @@ static int diff_opt_find_object(const struct option *option,
>  	struct object_id oid;
>  
>  	BUG_ON_OPT_NEG(unset);
> +	if (!startup_info->have_repository)
> +		return error(_("--find-object requires a git repository"));
>  	if (repo_get_oid(the_repository, arg, &oid))
>  		return error(_("unable to resolve '%s'"), arg);

Makes sense.

> diff --git a/t/t4053-diff-no-index.sh b/t/t4053-diff-no-index.sh
> index 69599279e9..15076dfe0d 100755
> --- a/t/t4053-diff-no-index.sh
> +++ b/t/t4053-diff-no-index.sh
> @@ -76,6 +76,16 @@ test_expect_success 'git diff --no-index executed outside repo gives correct err
>  	)
>  '
>  
> +test_expect_success 'git diff --find-object outside repo fails gracefully' '
> +	(
> +		GIT_CEILING_DIRECTORIES=$TRASH_DIRECTORY/non &&
> +		export GIT_CEILING_DIRECTORIES &&
> +		cd non/git &&
> +		test_must_fail git diff --find-object=abc123 2>err &&
> +		test_grep "find-object requires a git repository" err
> +	)
> +'

Looks good, too.

Will queue.  Thanks.



>  test_expect_success 'diff D F and diff F D' '
>  	(
>  		cd repo &&
>
> base-commit: 67ad42147a7acc2af6074753ebd03d904476118f

[gitgitgadget]

This patch series was integrated into seen via git@4a4d558.

[gitgitgadget]

This patch series was integrated into seen via git@2879e6c.

[gitgitgadget]

This patch series was integrated into next via git@fcff548.

[gitgitgadget]

This branch is now known as mm/diff-no-index-find-object.