Re: [PATCH 8/8] rebase: implement --[no-]autostash and rebase.autostash

2013-05-10 Thread Junio C Hamano
Ramkumar Ramachandra writes: > +finish_rebase () { > + if test -f "$state_dir/autostash" > + then > + stash_sha1=$(cat "$state_dir/autostash") > + if git stash apply $stash_sha1 2>&1 >/dev/null > + then > + echo "Applied autostash" >

Re: [PATCH 8/8] rebase: implement --[no-]autostash and rebase.autostash

2013-05-10 Thread Eric Sunshine
On Fri, May 10, 2013 at 10:26 AM, Ramkumar Ramachandra wrote: > diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh > new file mode 100755 > index 000..8386998 > --- /dev/null > +++ b/t/t3420-rebase-autostash.sh > @@ -0,0 +1,148 @@ > +#!/bin/sh > +# > +# Copyright (c) 2013 R

[PATCH 8/8] rebase: implement --[no-]autostash and rebase.autostash

2013-05-10 Thread Ramkumar Ramachandra
This new feature allows a rebase to be executed on a dirty worktree. It works by creating a temporary stash and storing it in $state_dir/autostash before the operation, and applying it after a successful operation. It will be removed along with the $state_dir if the operation is aborted. The feat