Merge branch 'maint' into tj/imap-send-remove-unused

diff --git a/git-pull.sh b/git-pull.sh
index 63da37bcc2730358140ae4b862040ed8fb0ed77e..902fc4adb4b95d27c6ba6c63f40108702dd93f11 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -11,7 +11,7 @@ OPTIONS_SPEC=
 . git-sh-setup
 . git-sh-i18n
 set_reflog_action "pull${1+ $*}"
-require_work_tree
+require_work_tree_exists
 cd_to_toplevel