A stash records the state of the files in the working tree as a merge
between the HEAD and another commit that records the state of the index,
that in turn is a child commit of the HEAD commit. In order to later
apply (or pop) the stash, however, only the tree objects of these three
commits are necessary.
This patch changes the structure of a stash to use a parentless new commit
that has the same tree as the HEAD commit, in place of the HEAD commit.
This way, a stash does not keep the history that leads to the HEAD commit
reachable, even if the stash is kept forever.
Signed-off-by: Nanako Shiraishi <nanako3@xxxxxxxxxxx>
---
The patch in the message Olivier quoted alone will be insufficient. This
is an update to that patch.
Documentation/git-stash.txt | 14 +++++++-------
git-stash.sh | 3 +++
t/t3903-stash.sh | 2 +-
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 23ac331..17c65e9 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -101,18 +101,18 @@ DISCUSSION
----------
A stash is represented as a commit whose tree records the state of the
-working directory, and its first parent is the commit at `HEAD` when
-the stash was created. The tree of the second parent records the
+working directory, and its first parent is the commit that has the same
+tree as the `HEAD`. The tree of the second parent records the
state of the index when the stash is made, and it is made a child of
-the `HEAD` commit. The ancestry graph looks like this:
+the first commit. The ancestry graph looks like this:
.----W
/ /
- -----H----I
+ H*---I
-where `H` is the `HEAD` commit, `I` is a commit that records the state
-of the index, and `W` is a commit that records the state of the working
-tree.
+where `H{asterisk}` is a commit with the same tree as the `HEAD`, `I` is
+a commit that records the state of the index, and `W` is a commit that
+records the state of the working tree.
EXAMPLES
diff --git a/git-stash.sh b/git-stash.sh
index 4938ade..8f374b3 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -54,6 +54,9 @@ create_stash () {
fi
msg=$(printf '%s: %s' "$branch" "$head")
+ # create the base commit that is parentless
+ b_commit=$(printf 'base of %s\n' "$msg" | git commit-tree "HEAD:")
+
# state of the index
i_tree=$(git write-tree) &&
i_commit=$(printf 'index on %s\n' "$msg" |
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 54d99ed..b083c04 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -32,7 +32,7 @@ index 0cfbf08..00750ed 100644
EOF
test_expect_success 'parents of stash' '
- test $(git rev-parse stash^) = $(git rev-parse HEAD) &&
+ test $(git rev-parse stash^^{tree}) = $(git rev-parse HEAD^{tree}) &&
git diff stash^2..stash > output &&
test_cmp output expect
'
--
1.5.6
--
Nanako Shiraishi
http://ivory.ap.teacup.com/nanako3/
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
