Merge branch 'rs/obsd-getcwd-workaround' into next

diff --git a/git-stash.sh b/git-stash.sh
index 9b6c2da7b4b75980403d836f6fa1fc516bdc3639..9aa09c3a33e5986d534be4c5a4209d234dfa4506 100755 (executable)
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -573,7 +573,7 @@ apply_stash () {
 
        if test -n "$u_tree"
        then
-               GIT_INDEX_FILE="$TMPindex" git-read-tree "$u_tree" &&
+               GIT_INDEX_FILE="$TMPindex" git read-tree "$u_tree" &&
                GIT_INDEX_FILE="$TMPindex" git checkout-index --all &&
                rm -f "$TMPindex" ||
                die "$(gettext "Could not restore untracked files from stash entry")"