git-stash

git-stash

[Johannes Schindelin]

Hi,

I just was in the need for git-stash (for the 1e6th time this year), but 
instead of writing a script, I though I'd try the "!" convention for 
aliases. Works quite well for me:

git config alias.stash '!git diff-files --name-only -z | git update-index 
-z --stdin && tree=$(git-write-tree) && commit=$(echo stash $(date) | 
git-commit-tree $tree) && git-update-ref refs/heads/stash $commit && 
git-reset --hard'

(This is one long line.)

With this, I can now say "git stash" with a dirty working directory, and 
it will have the same effect as "git reset --hard", i.e. reset to the 
clean state in HEAD.

Except that all my changes are stashed away in the branch "stash". It is 
not really a branch, as I expect it to jump from loose end to loose end, 
like this:

A - B - C - D - E - F - G - H - ...  (master branch)
  \               \       \
    A'  ..          E'  ..  G'       (stash branch)

The ".." denote reflog connections: "git log stash" will show G' and as 
its parent G with its history, while "git reflog stash" will show G', and 
then E', and then A'.

Maybe it is not only useful for me...

Ciao,
Dscho

Re: git-stash

[Lars Hjemli]

On 6/8/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> git-commit-tree $tree

I added -p HEAD here, and it's even nicer ;-)

Thanks!

--
larsh

Re: git-stash

[Johannes Schindelin]

Hi,

On Fri, 8 Jun 2007, Lars Hjemli wrote:

> On 6/8/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > git-commit-tree $tree
> 
> I added -p HEAD here, and it's even nicer ;-)

Yep, you're right. I forgot that in my "final" version.

Thanks,
Dscho

Re: git-stash

[Lars Hjemli]

On 6/8/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> I just was in the need for git-stash (for the 1e6th time this year), but
> instead of writing a script, I though I'd try the "!" convention for
> aliases.

Fwiw, here's a very simple unstash:

git config alias.unstash '!git diff --binary stash^ stash | git-apply -'

--
larsh

Re: git-stash

[Bill Lear]

On Thursday, June 7, 2007 at 23:28:33 (+0100) Johannes Schindelin writes:
>Hi,
>
>I just was in the need for git-stash (for the 1e6th time this year), but 
>instead of writing a script, I though I'd try the "!" convention for 
>aliases. Works quite well for me:

Excellent work.  I do this sort of stuff all the time.  I called my
lame version "shelf", but this works for me ...


Bill

Re: git-stash

[Matthias Lederhofer]

Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> I just was in the need for git-stash (for the 1e6th time this year), but 
> instead of writing a script, I though I'd try the "!" convention for 
> aliases. Works quite well for me:

I have scripts saving and restoring the current state of the working
tree in the current branch using two commits: one is the current index
and the other one the index after adding all changes.

% tail -n 1000 save restore
==> save <==
#!/bin/sh
set -e
die() { echo "$0: $*" >&2; exit 1; }

parent=$(git rev-parse HEAD^0 2> /dev/null) || die requires at least one commit
tree=$(git write-tree)
commit=$(echo wip index | git commit-tree $tree -p $parent)

git diff-files --name-only -z | git update-index --remove -z --stdin
tree=$(git write-tree)
commit=$(echo wip working tree | git commit-tree $tree -p $commit)

git update-ref -m 'wip save' HEAD $commit
echo saved wip

==> restore <==
#!/bin/sh
set -e
die() { echo "$0: $*" >&2; exit 1; }

p=$(git rev-parse HEAD~1) || die requires at least 3 commits
pp=$(git rev-parse HEAD~2) || die requires at least 3 commits
git-read-tree --reset $p

git update-ref -m 'wip restore' HEAD $pp
echo restored wip