Re: [PATCH 2/2] git-gc: skip stashes when expiring reflogs
- From
しらいしななこ <nanako3@bluebottle.com>
- Date
- Jun 14, 2008, 23:59 UTC
- Message-ID
- <200806142359.m5ENxsBI028758@mi0.bluebottle.com>
- In-Reply-To
- <612BAE20-8DF3-4323-8AEF-527B92122A7A@wincent.com>
Wincent Colaiuta <win@wincent.com> writes:
> (2) The people largely responsible for the implementation of "git > stash" never envisaged its use for long term storage (either > intentional abuse of "stash", or inadvertent misuse) and architected > it in such a way that it can "forget" stashes after a period of time
I apologize for my lack of perfect foresight as the original author of the command. As I already said, I think expiration period of reflogs that is configurable for each ref as suggested earlier by Junio makes sense.
But changing the default expiration "never" for stash has its own problem and I think we need to modify the way a stash entry is created to solve it.
You will find in the DISCUSSION section of git-stash manual page that a stash entry is represented as a commit that is a merge between the commit the stash was made on (H), and a fake commit whose tree records the contents of the index (I). The merge commit itself records the state of the files in the working directory as its tree (W):
.----W
/ /
-----H----IIf you do not expire stash forever, you will keep the history behind the commit H. This is unnecessary and is problematic particularly if you rebase your branches frequently.
In order to apply a stash, all you need is the tree of the three commits contained in this structure. You do not need the history behind commit H.
The following is a trial patch to change how a stash is recorded. With this patch I do not think we will keep unnecessary commits behind H in the repository even when a stash is kept forever.
diff --git a/git-stash.sh b/git-stash.sh index 4938ade..f4c4236 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" |
-- Nanako Shiraishi http://ivory.ap.teacup.com/nanako3/ ---------------------------------------------------------------------- Get a free email address with REAL anti-spam protection. http://www.bluebottle.com/tag/1