From: Ramkumar Ramachandra Date: Sat, 15 Jun 2013 13:13:26 GMT Subject: [PATCH v3 5/5] rebase: use 'git stash store' to simplify logic Message-ID: <1371302006-29775-6-git-send-email-artagnon@gmail.com> In-Reply-To: <1371302006-29775-1-git-send-email-artagnon@gmail.com> rebase has no reason to know about the implementation of the stash. In the case when applying the autostash results in conflicts, replace the relevant code in finish_rebase () to simply call 'git stash store'. Signed-off-by: Ramkumar Ramachandra --- git-rebase.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/git-rebase.sh b/git-rebase.sh index d0c11a9..17be392 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -153,11 +153,8 @@ finish_rebase () { then echo "$(gettext 'Applied autostash.')" else - ref_stash=refs/stash && - >>"$GIT_DIR/logs/$ref_stash" && - git update-ref -m "autostash" $ref_stash $stash_sha1 || - die "$(eval_gettext 'Cannot store $stash_sha1')" - + git stash store -m "autostash" -q $stash_sha1 || + die "$(eval_gettext "Cannot store \$stash_sha1")" gettext 'Applying autostash resulted in conflicts. Your changes are safe in the stash. You can run "git stash pop" or "git stash drop" it at any time. -- 1.8.3.1.441.gd7d6b72.dirty