[PATCH] fixup! rebase: implement --[no-]autostash and rebase.autostash
For rr/rebase-autostash, which is stalled in pu. See $gmane/225689.
This is a super-minor fix anyway: if you disagree with something, change
it; there's no need to ask me.
As for the follow-up introducing a 'stash store', I will submit it in
good time: there's no hurry. I'm working on some other interesting
things in the meantime (see hot-branch and @{push}).
Thanks.
Signed-off-by: Ramkumar Ramachandra artag...@gmail.com
---
git-rebase.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 709ef6b..5906757 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -151,16 +151,16 @@ finish_rebase () {
stash_sha1=$(cat $state_dir/autostash)
if git stash apply $stash_sha1 21 /dev/null
then
- echo Applied autostash
+ 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')
- echo
-$(gettext 'Applying autostash resulted in conflicts.
+ gettext 'Applying autostash resulted in conflicts.
Your changes are safe in the stash.
-You can apply or drop it at any time.')
+You can run git stash pop or git stash drop it at any time.
+'
fi
fi
git gc --auto
--
1.8.3.rc3.11.geb5ebca
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] fixup! rebase: implement --[no-]autostash and rebase.autostash
Ramkumar Ramachandra artag...@gmail.com writes:
For rr/rebase-autostash, which is stalled in pu. See $gmane/225689.
This is a super-minor fix anyway: if you disagree with something, change
it; there's no need to ask me.
As I wasn't the one who were disagreeing, that would not work
well.
Was there anybody disagreeing in the first place? I thought
everybody was helping the series to get better.
git-rebase.sh | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-rebase.sh b/git-rebase.sh
index 709ef6b..5906757 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -151,16 +151,16 @@ finish_rebase () {
stash_sha1=$(cat $state_dir/autostash)
if git stash apply $stash_sha1 21 /dev/null
then
- echo Applied autostash
+ 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')
- echo
-$(gettext 'Applying autostash resulted in conflicts.
+ gettext 'Applying autostash resulted in conflicts.
Your changes are safe in the stash.
-You can apply or drop it at any time.')
+You can run git stash pop or git stash drop it at any time.
+'
fi
fi
git gc --auto
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] fixup! rebase: implement --[no-]autostash and rebase.autostash
Junio C Hamano wrote: As I wasn't the one who were disagreeing, that would not work well. I meant in the tiny details like echo + gettext versus gettext. From the review of v3, nobody had any disagreements; just minor suggestions: that's what this patch is about anyway. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH] fixup! rebase: implement --[no-]autostash and rebase.autostash
Junio C Hamano gits...@pobox.com writes: Ramkumar Ramachandra artag...@gmail.com writes: For rr/rebase-autostash, which is stalled in pu. See $gmane/225689. This is a super-minor fix anyway: if you disagree with something, change it; there's no need to ask me. As I wasn't the one who were disagreeing, that would not work well. Was there anybody disagreeing in the first place? I was the one suggesting the change, but I do not disagree with anything ;-). The fixup is right. I think Ramkumar was just saying feel free to edit while applying, not that there was any disagreement actually. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
