oneway_merge(): only lstat() when told to update worktree

diff --git a/git-stash.sh b/git-stash.sh
index fe4ab28b2e10f85b20ff7892663cbb141fad4723..bbefdf64244063f4708f381b8a772466d64e90e5 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -199,8 +199,8 @@ save_stash () {
                        #    $ git stash save --blah-blah 2>&1 | head -n 2
                        #    error: unknown option for 'stash save': --blah-blah
                        #           To provide a message, use git stash save -- '--blah-blah'
-                       eval_gettextln "$("error: unknown option for 'stash save': \$option
-       To provide a message, use git stash save -- '\$option'")"
+                       eval_gettextln "error: unknown option for 'stash save': \$option
+       To provide a message, use git stash save -- '\$option'"
                        usage
                        ;;
                *)
@@ -469,6 +469,7 @@ apply_stash () {
        else
                # Merge conflict; keep the exit status from merge-recursive
                status=$?
+               git rerere
                if test -n "$INDEX_OPTION"
                then
                        gettextln "Index was not unstashed." >&2