pull,rebase: handle GIT_WORK_TREE better

You can't currently run git-pull or git-rebase from outside of the work tree, even with GIT_WORK_TREE set, due to an overeager require_work_tree function. Commit e2eb527 documents this problem and provides the infrastructure for a fix, but left it to later commits to audit and update individual scripts. Changing these scripts to use require_work_tree_exists is easy to verify. We immediately call cd_to_toplevel, anyway. Therefore no matter which function we use, the state afterwards is one of: 1. We have a work tree, and we are at the top level. 2. We don't have a work tree, and we have died. The only catch is that we must also make sure no code that ran before the cd_to_toplevel assumed that we were already in the working tree. In this case, we will only have included shell libraries and called set_reflog_action, neither of which care about the current working directory at all. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Oct 13, 2011 at 11:59 UTC 035b5bf6431dbf8f3cde2f44b0d7ef893b95b605
2 files changed +2 -2
git-pull.sh
+1 -1
@@ -10,7 +10,7 @@ SUBDIRECTORY_OK=Yes
10 OPTIONS_SPEC=
11 . git-sh-setup
12 set_reflog_action "pull $*"
13 -require_work_tree
13 +require_work_tree_exists
14 cd_to_toplevel
15
16
git-rebase.sh
+1 -1
@@ -31,7 +31,7 @@ SUBDIRECTORY_OK=Yes
31 OPTIONS_SPEC=
32 . git-sh-setup
33 set_reflog_action rebase
34 -require_work_tree
34 +require_work_tree_exists
35 cd_to_toplevel
36
37 LF='