All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: "brian m. carlson" <sandals@crustytoothpaste.net>
Cc: <git@vger.kernel.org>, Derrick Stolee <dstolee@gmail.com>,
	Thomas Gummerer <t.gummerer@gmail.com>
Subject: Re: [PATCH 0/6] Importing and exporting stashes to refs
Date: Thu, 10 Mar 2022 11:14:59 -0800	[thread overview]
Message-ID: <xmqq35jpei18.fsf@gitster.g> (raw)
In-Reply-To: <20220310173236.4165310-1-sandals@crustytoothpaste.net> (brian m. carlson's message of "Thu, 10 Mar 2022 17:32:30 +0000")

"brian m. carlson" <sandals@crustytoothpaste.net> writes:

> ...  The commits used in a stash export are nearly
> identical to those used in the stashes, with one notable change: the
> first parent of a stash is a pointer to the previous stash, or an empty
> commit if there is no previous stash.  All of the other parents used in
> the stash commit are present following it in their normal order.
> ...
> We intentionally attempt to exactly round-trip commits between stashes,
> although we don't do so for the exported data due to the base commit not
> having identical timestamps.  Preserving the commits exactly lets us
> more efficiently test our code and it also permits users to more easily
> determine if they have the same data.

Hmph, out of reflog entries stash@{0}, stash@{1}, stash@{3}, if we
create a chain of commits A, B, C such that

	A^2 = B, A^1 = stash@{0}
	B^2 = C, B^1 = stash@{1}
	         C^1 = stash@{2}

then the original stash entry commits can be recreated identically,
and after you export the stash as "A", you can "import" from it
without creating any new commit to represent the stash entries, no?

When we create A, if we use a predictable commit log message and
the same author/committer ident as A^1 (i.e. stash@{0}), and do it
the same for B and C, then no matter who exports the stash and at
which time, we'd get an identical result, I would presume.

> The tooling here is intentionally plumbing.  It's designed to be simple
> and functional and get the basic job done.  If we want additional
> features, we can add them in the future, but this should be a simple,
> basic feature set that can support additional uses.

Sounds sensible.

  parent reply	other threads:[~2022-03-10 19:15 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 ` Junio C Hamano [this message]
2022-03-10 21:04   ` [PATCH 0/6] Importing and exporting stashes to refs 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
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=xmqq35jpei18.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=dstolee@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=sandals@crustytoothpaste.net \
    --cc=t.gummerer@gmail.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.