lf_to_crlf_filter(): tell the caller we added "\n" when draining

[git.git] / git-pull.sh

diff --git a/git-pull.sh b/git-pull.sh
index eec3a07f0fa45013e8d9fa9a3dd1a2fab98a2970..63da37bcc2730358140ae4b862040ed8fb0ed77e 100755 (executable)
--- a/git-pull.sh
+++ b/git-pull.sh
@@ -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.