Ramkumar Ramachandra artag...@gmail.com writes:
+finish_rebase () {
+ if test -f $state_dir/autostash
+ then
+ stash_sha1=$(cat $state_dir/autostash)
+ if git stash apply $stash_sha1 21 /dev/null
+ then
+ echo Applied
Junio C Hamano wrote:
Writing it like this:
[...]
with a blank line before the next echo, it would be more readable.
This feels funny. Why not
[...]
without an extra command substitution with an echo?
I'll re-roll if there are more comments. Otherwise, can you fix these
up locally?
Ramkumar Ramachandra artag...@gmail.com writes:
+finish_rebase () {
+ if test -f $state_dir/autostash
+ then
+ stash_sha1=$(cat $state_dir/autostash)
+ if git stash apply $stash_sha1 21 /dev/null
+ then
+ echo Applied
Matthieu Moy wrote:
Any reason why this is not using gettext and the other messages do.
You can run git stash apply or git stash drop at any time.
Fixed. Thanks.
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More
Ramkumar Ramachandra artag...@gmail.com writes:
Matthieu Moy wrote:
Any reason why this is not using gettext and the other messages do.
You can run git stash apply or git stash drop at any time.
Fixed. Thanks.
After thinking a bit, I have another nit about the message: it's not
clear
Ramkumar Ramachandra artag...@gmail.com writes:
Junio C Hamano wrote:
Writing it like this:
[...]
with a blank line before the next echo, it would be more readable.
This feels funny. Why not
[...]
without an extra command substitution with an echo?
I'll re-roll if there are more
Junio C Hamano wrote:
No, thanks. I won't be even taking the patch right now, so you have
plenty of time ;-).
There were some additional comments from Matthieu, so I will re-roll
(just this part). I've even posted a stash series based on this one.
Do you have any additional comments?
--
To
Phil Hord wrote:
Because I am in a git-rebase which has apparently failed, I would
expect 'git rebase --abort' would save me here. But it does not and
you have given me some unique instructions to try to recover. I
suppose rebase--abort cannot be made to recover in this case because
this is
Phil Hord phil.h...@gmail.com writes:
Because I am in a git-rebase which has apparently failed, I would
expect 'git rebase --abort' would save me here.
More generally, if I git rebase --abort in the middle of a rebase (not
necessarily at the end), I'd expect the stash to be restored. Right
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
Ramkumar Ramachandra artag...@gmail.com writes:
+apply_autostash () {
+ if test -f $state_dir/autostash
+ then
+ stash_sha1=$(cat $state_dir/autostash)
+ git stash apply $stash_sha1 21 /dev/null ||
+ die
+$(eval_gettext 'Applying autostash
Junio C Hamano wrote:
Perhaps finish_rebase or something?
Sure. That makes sense.
I was too busy struggling with shell code to notice these things ;)
--
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
On Tue, Apr 23, 2013 at 10:02 AM, Ramkumar Ramachandra
artag...@gmail.com wrote:
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
13 matches
Mail list logo
