From ceff079bdcaebb67b0379a1036a32b4dfebb6012 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 25 Jul 2007 15:32:22 -0700 Subject: Make sure git-stash works from subdirectory. We say "SUBDIRECTORY_OK" but we did not chdir to toplevel; this is fine as long as everything we use can be started from a subdirectory, but unfortunately "merge-recursive" is not one of the programs you can safely use from a subdirectory. Signed-off-by: Junio C Hamano --- git-stash.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'git-stash.sh') diff --git a/git-stash.sh b/git-stash.sh index de13dd1812..d9cd42d4b3 100755 --- a/git-stash.sh +++ b/git-stash.sh @@ -6,6 +6,7 @@ USAGE='[ | list | show | apply | clear]' SUBDIRECTORY_OK=Yes . git-sh-setup require_work_tree +cd_to_toplevel TMP="$GIT_DIR/.git-stash.$$" trap 'rm -f "$TMP-*"' 0 -- cgit v1.2.3