From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 29 May 2013 17:32:18 GMT
Subject: Re: [PATCH] fixup! rebase: implement --[no-]autostash and rebase.autostash
Message-ID: <7vzjvdu1y5.fsf@alter.siamese.dyndns.org>
In-Reply-To: <1369825880-8608-1-git-send-email-artagnon@gmail.com>

Ramkumar Ramachandra <artagnon@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 2>&1 >/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 &&