On Fri, Jun 14, 2013 at 6:32 AM, Ramkumar Ramachandra
<artagnon@xxxxxxxxx> wrote:
> 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@xxxxxxxxx>
> ---
> git-rebase.sh | 6 +-----
> 1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/git-rebase.sh b/git-rebase.sh
> index d0c11a9..bf37259 100755
> --- a/git-rebase.sh
> +++ b/git-rebase.sh
> @@ -153,11 +153,7 @@ 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" -e "Cannot store $stash_sha1." $stash_sha1
nit: adds a period where there was not one previously.
Maybe this doesn't matter so much since this code is new anyway. But
showing a period after sha1 seems wrong, too. Or maybe I am confused
again. Does eval_gettext routinely add a period to the end of
translated strings?
> 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.383.g0d5ad6b
>
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html