When doing git stash 2 commits are created. One is referenced by the stash ref and has 2 parent commits. One parent is the index of where we did the stash. The other parent has the actual contents of what we stashed.
Why are 2 commits needed for the stash? It seems to me that only 1 was sufficient. I.e. just make stash ref to the commit that has the actual contents.
Would this not work?
Why does git stash creates 2 commit objects? Seems like 1 was adequate
175 Views Asked by Jim At
1
There are 1 best solutions below
Related Questions in GIT
- Push mysql database script to server using git
- Git show's file path
- Git > diffs filtered, show only certain changed classes/files
- Pushing to git repository hosted by Visual studio online without entering user name and password
- How do I create my own Git branch to work on?
- Git init --bare giving error fatal: Out of memory? mmap failed: No such device
- Sub-directory into independent repository and later merge back into main repository
- How to find the Git Revision Hash in a synced SVN repo using SubGit?
- eclipse errors when try to change to master git branch
- How to have Heroku build my development branch on a staging server?
- Is "Merged in" a commit message created by bitbucket, or git?
- Git: Multiple projects under one directory
- Permission denied hg-git
- Is it possible to clone a private git repo without adding ssh keys
- Track file in master repository which is ignored in submodule
Related Questions in GIT-COMMIT
- GIT: remove commit halfway down in log but keep all overs
- LibGit2Sharp get repository changes after pull
- How to update the directory in git
- Couldn't set refs/heads/master when commit
- How to git commit in a new branch after I've already made the changes?
- Remove commit from history
- Can git filter out certain lines before commit?
- Can git ever send your code to a repo that isn't yours?
- git: What is the "right way" to fix an incorrect pushed commit message
- GIT Tag not on current commit
- How to save changes when in detached-head state?
- Move the commit from username to another?
- remove commits from contributor
- SourceTree: dst ref refs/heads/master receives from more than one src
- Display the Authors and commit message for commits that cause a conflict
Related Questions in GIT-STASH
- Git stash pop on master branch
- how to get the stash back after pulling
- How do I save work in progress without using git-stash?
- git stash clear, except a specific stash
- Run tests only for staged files: `git stash -k -u` and `git stash pop` will raise conflicts on partial staged files
- Git stash and apply to a branch
- Why does git stash creates 2 commit objects? Seems like 1 was adequate
- Can I use git pull --rebase instead of "git stash git pull git stash pop"?
- In Git, what is the purpose of the index?
- git assume-unchanged and git stash
- Manage git repository with multiple remote repos
- Why is a stash represented as 2 commits?
- automatically stash save/pop changes on git rebase?
- git from checked-out stash to branch
- Git stash / detached head
Trending Questions
- UIImageView Frame Doesn't Reflect Constraints
- Is it possible to use adb commands to click on a view by finding its ID?
- How to create a new web character symbol recognizable by html/javascript?
- Why isn't my CSS3 animation smooth in Google Chrome (but very smooth on other browsers)?
- Heap Gives Page Fault
- Connect ffmpeg to Visual Studio 2008
- Both Object- and ValueAnimator jumps when Duration is set above API LvL 24
- How to avoid default initialization of objects in std::vector?
- second argument of the command line arguments in a format other than char** argv or char* argv[]
- How to improve efficiency of algorithm which generates next lexicographic permutation?
- Navigating to the another actvity app getting crash in android
- How to read the particular message format in android and store in sqlite database?
- Resetting inventory status after order is cancelled
- Efficiently compute powers of X in SSE/AVX
- Insert into an external database using ajax and php : POST 500 (Internal Server Error)
Popular Questions
- How do I undo the most recent local commits in Git?
- How can I remove a specific item from an array in JavaScript?
- How do I delete a Git branch locally and remotely?
- Find all files containing a specific text (string) on Linux?
- How do I revert a Git repository to a previous commit?
- How do I create an HTML button that acts like a link?
- How do I check out a remote Git branch?
- How do I force "git pull" to overwrite local files?
- How do I list all files of a directory?
- How to check whether a string contains a substring in JavaScript?
- How do I redirect to another webpage?
- How can I iterate over rows in a Pandas DataFrame?
- How do I convert a String to an int in Java?
- Does Python have a string 'contains' substring method?
- How do I check if a string contains a specific word?
git stashwill, in fact, make up to three commits. The two that you have observed are the default two: one for the index state—remember that in Git, the index, also called the staging area, contains the next commit to write, and is updated every time yougit addnew contents—and one for the work-tree state. These may differ from each other and/or from theHEADcommit at the time you create the stash.The fundamental issue is that
git stashis not meant only to save your current work-tree, nor only to save your current index state, nor only to save some combination of the two. If you intended to save the current index state, you could simply make an ordinary commit. If you intended to save a combination of the two, you could simply rungit commit -a.Instead,
git stashdefaults to saving both the index state and the work-tree state, separately. This allows you to retrieve both separate states again later, if that's what you mean to do. It allows you to retrieve a mashed-together version of both states, if that's what you mean to do. And, if you use-uor-a, so thatgit stashmakes its third commit containing untracked or untracked-and-ignored files, it allows you recover all those various states.You express your final intent not at the time you save the stash, but rather at the time you recover it.1 This may not be the best possible design, since (a) sometimes it's not possible to recover your intended state, and (b) if you use
git stash popwithout--indexwhen you had intended to use--index, this destroys the separated state and then discards both commits, making it exceedingly difficult to recover. In general, though, deferring decisions is usually a good approach.1If you use
--keep-indexat the time you save the stash, you are in fact asserting at least some intent at save-time. But that's another matter entirely. Moreover, there's a long-standing bug ingit stashthat makes keeping both index and work-tree state separate problematic. See here for details.