Re: [PATCH 7/7] rebase: implement --[no-]autostash and rebase.autostash

From: Matthieu Moy <matthieu.moy@grenoble-inp.fr>
Date: May 13, 2013, 08:24 UTC
Message-ID: <vpq1u9be18t.fsf@grenoble-inp.fr>
In-Reply-To: <1368359801-28121-8-git-send-email-artagnon@gmail.com>

Ramkumar Ramachandra <artagnon@gmail.com> writes:

Show 7 quoted lines

> +finish_rebase () {
> +	if test -f "$state_dir/autostash"
> +	then
> +		stash_sha1=$(cat "$state_dir/autostash")
> +		if git stash apply $stash_sha1 2>&1 >/dev/null
> +		then
> +			echo "Applied autostash"

Any reason why this is not using gettext and the other messages do.

Show 9 quoted lines

> +		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.
> +Your changes are safe in the stash.
> +You can apply or drop it at any time.')"

Good idea to put the autostash in an actual stash. Perhaps the message can be made more explicit, e.g.

  You can run "git stash apply" or "git stash drop" at any time.

(actually, "git stash pop" may be a better suggestion to "git stash apply" here).

-- 
Matthieu Moy
http://www-verimag.imag.fr/~moy/