git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
	Phillip Wood <phillip.wood123@gmail.com>
Subject: Re: [PATCH v4 3/4] builtin/stash: provide a way to export stashes to a ref
Date: Wed, 13 Apr 2022 17:36:05 +0200	[thread overview]
Message-ID: <220413.86ee21f0g9.gmgdl@evledraar.gmail.com> (raw)
In-Reply-To: <20220407215352.3491567-4-sandals@crustytoothpaste.net>


On Thu, Apr 07 2022, brian m. carlson wrote:

> +static int write_commit_with_parents(struct object_id *out, const struct object_id *oid, struct commit_list *parents)
> +{
> +	size_t author_len, committer_len;
> +	struct commit *this;
> +	const char *orig_author, *orig_committer;
> +	char *author = NULL, *committer = NULL;
> +	const char *buffer;
> +	unsigned long bufsize;
> +	const char *p;
> +	struct strbuf msg = STRBUF_INIT;
> +	int ret = 0;
> +
> +	this = lookup_commit_reference(the_repository, oid);
> +	buffer = get_commit_buffer(this, &bufsize);
> +	orig_author = find_commit_header(buffer, "author", &author_len);
> +	orig_committer = find_commit_header(buffer, "committer", &committer_len);

In builtin/am.c we also start with this, but follow it with passing the
data through split_ident_line(), any reason we're not doing the same
thing here, and are there cases wehre that would result in propagating
not-sanity-checked-enough data?


> +	p = memmem(buffer, bufsize, "\n\n", 2);
> +
> +	if (!orig_author || !orig_committer || !p) {
> +		ret = error(_("cannot parse commit %s"), oid_to_hex(oid));
> +		goto out;
> +	}
> +	/* Jump to message. */
> +	p += 2;
> +	strbuf_addstr(&msg, "git stash: ");
> +	strbuf_add(&msg, p, bufsize - (p - buffer));

And more on those behavior differences, the am.c version seems to not
care that we *might* have a \0 in a commit buffer and just uses
xstrdup(msg + 2).

But this one looks like it will faithfully carry that \0-containing
message forward.

Probably OK, just checking...

  parent reply	other threads:[~2022-04-13 15:49 UTC|newest]

Thread overview: 76+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-10 17:32 [PATCH 0/6] Importing and exporting stashes to refs brian m. carlson
2022-03-10 17:32 ` [PATCH 1/6] builtin/stash: factor out generic function to look up stash info brian m. carlson
2022-03-10 17:32 ` [PATCH 2/6] builtin/stash: fill in all commit data brian m. carlson
2022-03-16 16:50   ` Junio C Hamano
2022-03-10 17:32 ` [PATCH 3/6] object-name: make get_oid quietly return an error brian m. carlson
2022-03-16 16:56   ` Junio C Hamano
2022-03-16 17:01     ` Drew Stolee
2022-03-16 21:40     ` brian m. carlson
2022-03-10 17:32 ` [PATCH 4/6] builtin/stash: provide a way to export stashes to a ref brian m. carlson
2022-03-11  2:08   ` Ævar Arnfjörð Bjarmason
2022-03-14 21:19     ` Phillip Wood
2022-03-15 10:50       ` Phillip Wood
2022-03-16 21:48       ` brian m. carlson
2022-03-18 13:34         ` C99 %zu support (on MSVC) (was: [PATCH 4/6] builtin/stash: provide a way to export stashes to a ref) Ævar Arnfjörð Bjarmason
2022-03-18 16:26           ` Phillip Wood
2022-03-24 14:02         ` [PATCH 4/6] builtin/stash: provide a way to export stashes to a ref Johannes Schindelin
2022-03-18 13:41       ` ssize_t portability (was: [PATCH 4/6] builtin/stash: provide a way to export stashes to a ref) Ævar Arnfjörð Bjarmason
2022-03-16 17:05   ` [PATCH 4/6] builtin/stash: provide a way to export stashes to a ref Junio C Hamano
2022-03-10 17:32 ` [PATCH 5/6] builtin/stash: provide a way to import stashes from " brian m. carlson
2022-03-16 17:26   ` Junio C Hamano
2022-03-16 21:50     ` brian m. carlson
2022-03-10 17:32 ` [PATCH 6/6] doc: add stash export and import to docs brian m. carlson
2022-03-16 17:34   ` Junio C Hamano
2022-03-16 21:44     ` Junio C Hamano
2022-03-10 19:14 ` [PATCH 0/6] Importing and exporting stashes to refs Junio C Hamano
2022-03-10 21:04   ` brian m. carlson
2022-03-10 21:38     ` Junio C Hamano
2022-03-10 22:42       ` brian m. carlson
2022-03-29 21:49 ` [PATCH v2 0/4] " brian m. carlson
2022-03-29 21:49   ` [PATCH v2 1/4] object-name: make get_oid quietly return an error brian m. carlson
2022-03-29 21:49   ` [PATCH v2 2/4] builtin/stash: factor out revision parsing into a function brian m. carlson
2022-03-29 21:49   ` [PATCH v2 3/4] builtin/stash: provide a way to export stashes to a ref brian m. carlson
2022-03-30 23:05     ` Junio C Hamano
2022-03-30 23:44       ` brian m. carlson
2022-03-31  1:56     ` Ævar Arnfjörð Bjarmason
2022-03-31 17:43       ` Junio C Hamano
2022-04-05 10:55       ` brian m. carlson
2022-04-06  9:05         ` Ævar Arnfjörð Bjarmason
2022-04-06 16:38         ` Junio C Hamano
2022-03-31  2:09     ` Ævar Arnfjörð Bjarmason
2022-04-05 10:22       ` brian m. carlson
2022-03-29 21:49   ` [PATCH v2 4/4] builtin/stash: provide a way to import stashes from " brian m. carlson
2022-03-31  1:48   ` [PATCH v2 0/4] Importing and exporting stashes to refs Junio C Hamano
2022-03-31  2:18     ` Ævar Arnfjörð Bjarmason
2022-04-03 18:22 ` [PATCH v3 " brian m. carlson
2022-04-03 18:22   ` [PATCH v3 1/4] object-name: make get_oid quietly return an error brian m. carlson
2022-04-03 18:22   ` [PATCH v3 2/4] builtin/stash: factor out revision parsing into a function brian m. carlson
2022-04-04 15:44     ` Phillip Wood
2022-04-03 18:22   ` [PATCH v3 3/4] builtin/stash: provide a way to export stashes to a ref brian m. carlson
2022-04-04  6:46     ` Ævar Arnfjörð Bjarmason
2022-04-03 18:22   ` [PATCH v3 4/4] builtin/stash: provide a way to import stashes from " brian m. carlson
2022-04-04 10:38     ` Ævar Arnfjörð Bjarmason
2022-04-05 10:03       ` brian m. carlson
2022-04-06  9:00         ` Ævar Arnfjörð Bjarmason
2022-04-04  0:05   ` [PATCH v3 0/4] Importing and exporting stashes to refs Junio C Hamano
2022-04-04  0:29     ` Junio C Hamano
2022-04-04  6:20       ` Ævar Arnfjörð Bjarmason
2022-04-05  9:15         ` brian m. carlson
2022-04-07 21:53 ` [PATCH v4 " brian m. carlson
2022-04-07 21:53   ` [PATCH v4 1/4] object-name: make get_oid quietly return an error brian m. carlson
2022-04-07 21:53   ` [PATCH v4 2/4] builtin/stash: factor out revision parsing into a function brian m. carlson
2022-04-07 21:53   ` [PATCH v4 3/4] builtin/stash: provide a way to export stashes to a ref brian m. carlson
2022-04-13 15:29     ` Ævar Arnfjörð Bjarmason
2022-04-13 15:36     ` Ævar Arnfjörð Bjarmason [this message]
2022-04-13 15:55     ` Ævar Arnfjörð Bjarmason
2022-04-07 21:53   ` [PATCH v4 4/4] builtin/stash: provide a way to import stashes from " brian m. carlson
2022-04-12 20:14     ` Jonathan Tan
2022-04-13  1:12       ` brian m. carlson
2022-04-13 17:34         ` Jonathan Tan
2022-04-13 18:25         ` Ævar Arnfjörð Bjarmason
2022-04-13 19:14           ` Jonathan Tan
2022-04-13 20:10         ` Junio C Hamano
2022-04-13 21:33           ` brian m. carlson
2022-04-13 21:43             ` Junio C Hamano
2022-04-13 18:33     ` Ævar Arnfjörð Bjarmason
2022-04-13 15:25   ` [PATCH v4 0/4] Importing and exporting stashes to refs Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=220413.86ee21f0g9.gmgdl@evledraar.gmail.com \
    --to=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood123@gmail.com \
    --cc=sandals@crustytoothpaste.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).