git/list[1] front-page[2] threads[3] people[4] search[5] about
 

git apply/am whitespace errors

From
Nneubyr <neubyr@gmail.com>
Date
Sep 26, 2011, 19:03 UTC
Message-ID
<CALFxCvxxbsgZnhqK9nN7h=1ASJzfDJ7aVF+rM-8RUyKhpv8FzQ@mail.gmail.com>
I am getting  following error while applying a patch using git-apply.

{{{ /tmp/patches/ticket11/0002-Commit-for-ticket-11.patch:51: new blank line at EOF. }}}

What does number '51' after colon ':' indicate? There aren't 51 lines in that patch file. Also, I had used check and stat options before applying match and it didn't indicate any warnings/errors. I tried git am interactive and it gave following error:

{{{
Applying: Commit for [ticket:11]. Created a directory to download lens
files and added .include_in_git empty hidden file.
/tmp/galaxy/.git/rebase-apply/patch:10: new blank line at EOF.
+
warning: 1 line adds whitespace errors.
Commit Body is:
}}}

I am trying to add a directory with a hidden empty file. Any elaboration on above warning/error messages will be really helpful.

-- thanks, neuby.r

Next: Junio C Hamano
Message 1 of 3 in “git apply/am whitespace errors”
  1. neubyrSep 26, 2011
  2. Junio C HamanoSep 26, 2011
  3. Junio C HamanoSep 26, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.