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

diff --git a/git-pull.sh b/git-pull.sh
index a10b1290bc9218942fcec54b9e930f072ca11bce..902fc4adb4b95d27c6ba6c63f40108702dd93f11 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -10,8 +10,8 @@ SUBDIRECTORY_OK=Yes
 OPTIONS_SPEC=
 . git-sh-setup
 . git-sh-i18n
-set_reflog_action "pull $*"
-require_work_tree
+set_reflog_action "pull${1+ $*}"
+require_work_tree_exists
 cd_to_toplevel
 
 
@@ -217,12 +217,9 @@ then
        # $orig_head commit, but we are merging into $curr_head.
        # First update the working tree to match $curr_head.
 
-       (
-               eval_gettext "Warning: fetch updated the current branch head.
+       eval_gettextln "Warning: fetch updated the current branch head.
 Warning: fast-forwarding your working tree from
-Warning: commit \$orig_head." &&
-               echo
-       ) >&2
+Warning: commit \$orig_head." >&2
        git update-index -q --refresh
        git read-tree -u -m "$orig_head" "$curr_head" ||
                die "$(eval_gettext "Cannot fast-forward your working tree.