[PATCH 5/5] rebase: use 'git stash store' to simplify logic
From: Ramkumar Ramachandra <hidden>
Date: 2016-06-15 22:57:44
Subsystem:
the rest · Maintainer:
Linus Torvalds
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 <redacted> --- git-rebase.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index d0c11a9..bf37259 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh@@ -153,11 +153,7 @@ 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" -e "Cannot store $stash_sha1." $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.383.g0d5ad6b