From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v3 5/5] rebase: use 'git stash store' to simplify logic
Date: Sat, 15 Jun 2013 18:43:26 +0530 [thread overview]
Message-ID: <1371302006-29775-6-git-send-email-artagnon@gmail.com> (raw)
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 <artagnon@gmail.com>
---
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
next prev parent reply other threads:[~2013-06-15 13:15 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-15 13:13 [PATCH v3 0/5] Write a good 'stash store' for autostash Ramkumar Ramachandra
2013-06-15 13:13 ` [PATCH v3 1/5] stash doc: add a warning about using create Ramkumar Ramachandra
2013-06-15 13:13 ` [PATCH v3 2/5] stash doc: document short form -p in synopsis Ramkumar Ramachandra
2013-06-15 13:13 ` [PATCH v3 3/5] stash: simplify option parser for create Ramkumar Ramachandra
2013-06-15 13:13 ` [PATCH v3 4/5] stash: introduce 'git stash store' Ramkumar Ramachandra
2013-06-17 18:43 ` Junio C Hamano
2013-06-18 8:50 ` Ramkumar Ramachandra
2013-06-18 14:31 ` Junio C Hamano
2013-06-15 13:13 ` Ramkumar Ramachandra [this message]
2013-06-16 1:22 ` [PATCH v3 0/5] Write a good 'stash store' for autostash Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371302006-29775-6-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).