git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 1/4] commit: make 'commit_graft_pos' non-static

From
Junio C Hamano <gitster@pobox.com>
Date
Apr 30, 2020, 20:55 UTC
Message-ID
<xmqqbln8r8wg.fsf@gitster.c.googlers.com>
In-Reply-To
<cb8dde2ae2e78d0bcfb61382fe7769c12804336b.1588275891.git.me@ttaylorr.com>
Taylor Blau <me@ttaylorr.com> writes:
Show 14 quoted lines
> -static int commit_graft_pos(struct repository *r, const unsigned char *sha1)
> +int commit_graft_pos(struct repository *r, const unsigned char *sha1)
>  {
>  	return sha1_pos(sha1, r->parsed_objects->grafts,
>  			r->parsed_objects->grafts_nr,
> diff --git a/commit.h b/commit.h
> index ab91d21131..eb42e8b6d2 100644
> --- a/commit.h
> +++ b/commit.h
> @@ -236,6 +236,7 @@ struct commit_graft {
>  typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
>  
>  struct commit_graft *read_graft_line(struct strbuf *line);
> +int commit_graft_pos(struct repository *r, const unsigned char *sha1);
In an earlier exchange, I saw this:
Show 16 quoted lines
>> - could include a comment saying that it's an index into
>>   r->parsed_objects->grafts
>
> This and the below are both good ideas to me. I prefer this one, since
> we'd have to duplicate yet another static function
> ('commit_graft_sha1_access()' directly above) that is called by this
> one.
>
>> - I'm usually loathe to suggest unnecessary duplication of code, but
>>   it might make sense to duplicate the function into shallow.c.  Or
>>   even to inline it there (in the single call site, that ends up
>>   being pretty readable).
>
> I am not at all offended by duplication of code where it makes sense to
> do so, but having to duplicate two functions seems like we'd be better
> off simply documenting the function in commit.h.

and I think I agree with that direction. Forgot to add those comments?

Previous: Taylor BlauNext: Taylor Blau
Message 3 of 8 in “shallow: extract a header file”
  1. 0/4 shallow: extract a header fileTaylor Blau, Apr 30, 2020
  2. 1/4 commit: make 'commit_graft_pos' non-staticTaylor Blau, Apr 30, 2020
  3. Junio C HamanoApr 30, 2020
  4. Taylor BlauApr 30, 2020
  5. 2/4 shallow: extract a header file for shallow-related functionsTaylor Blau, Apr 30, 2020
  6. 3/4 shallow.h: document '{commit,rollback}_shallow_file'Taylor Blau, Apr 30, 2020
  7. 4/4 shallow: use struct 'shallow_lock' for additional safetyTaylor Blau, Apr 30, 2020
  8. Taylor BlauApr 30, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.