From: Taylor Blau <me@ttaylorr.com>
To: Abhijeet Sonar <abhijeet.nkt@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: Why is pushing to stash not allowed without an initial commit?
Date: Thu, 17 Oct 2024 15:01:17 -0400 [thread overview]
Message-ID: <ZxFe/cEI0SzFMSi0@nand.local> (raw)
In-Reply-To: <bab5a7a9-f006-4a1f-ae38-2dec817c5a82@gmail.com>
On Thu, Oct 17, 2024 at 08:51:29PM +0530, Abhijeet Sonar wrote:
> I see that the stash commit has two parents: the initial commit and the
> commit that actually holds the files that were stashed.
>
> If git were to allow a stash entry with no initial commit, it would have to
> create a stash commit with only one parent (i.e. the commit labeled with
> 'index on <branch>'). I wonder if there is a reason this would be bad and
> therefore not allowed?
Right, each stash entry has two parents:
- The first parent is the state of HEAD in your repository when you
created the stash entry,
- The second parent is the state of the index at the same point
So there would be no reasonable value to substitute in for the first
parent in the case where your repository does not yet have any commits.
As a concept, stashing without any commits in your repository doesn't
seem fundamentally flawed, but it would make interpreting other stash
entries substantially more awkward. The current model ensures that if
you look at any stash entry S, then S^1 is the state of HEAD when S was
created, and S^2 is likewise the state of the index.
That changes if you don't have a commit to store in S^1, since now the
interpretation of S^1 depends on how many parents S has to begin with.
Thanks,
Taylor
next prev parent reply other threads:[~2024-10-17 19:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-17 15:21 Why is pushing to stash not allowed without an initial commit? Abhijeet Sonar
2024-10-17 19:01 ` Taylor Blau [this message]
2024-10-17 20:50 ` Sergey Organov
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=ZxFe/cEI0SzFMSi0@nand.local \
--to=me@ttaylorr.com \
--cc=abhijeet.nkt@gmail.com \
--cc=git@vger.kernel.org \
/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).