[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [lwip-devel] [bug #50534] TFTP server does not copy terminating null
From: |
Sylvain Rochet |
Subject: |
Re: [lwip-devel] [bug #50534] TFTP server does not copy terminating null of filename |
Date: |
Tue, 14 Mar 2017 09:55:20 +0100 |
User-agent: |
Mutt/1.5.23 (2014-03-12) |
Hi Axel,
On Tue, Mar 14, 2017 at 04:46:44PM +0800, Axel Lin wrote:
>
> However, I got:
> $ git pull
> Updating eb1aadb..1f1f2e1
> error: Your local changes to the following files would be overwritten by
> merge:
> src/apps/tftp/tftp_server.c
> Please commit your changes or stash them before you merge.
> Aborting
>
> git checkout -f does not help.
> Note, I remember such problem happened once before and I fixed it by
> re-clone the git tree.
This is because *.c files are automatically normalized:
lwip$ cat .gitattributes
# These files are text and should be normalized
*.txt text
*.c text
*.h text
Git normalized tftp_server.c and want you to commit the change.
Sylvain
signature.asc
Description: Digital signature
- [lwip-devel] [bug #50534] TFTP server does not copy terminating null of filename, David Rodgers, 2017/03/13
- [lwip-devel] [bug #50534] TFTP server does not copy terminating null of filename, Dirk Ziegelmeier, 2017/03/13
- [lwip-devel] [bug #50534] TFTP server does not copy terminating null of filename, Simon Goldschmidt, 2017/03/13
- Re: [lwip-devel] [bug #50534] TFTP server does not copy terminating null of filename, Axel Lin, 2017/03/13
- Re: [lwip-devel] [bug #50534] TFTP server does not copy terminating null of filename, Dirk Ziegelmeier, 2017/03/14
- Re: [lwip-devel] [bug #50534] TFTP server does not copy terminating null of filename, Axel Lin, 2017/03/14
- Re: [lwip-devel] [bug #50534] TFTP server does not copy terminating null of filename, Axel Lin, 2017/03/14
- Re: [lwip-devel] [bug #50534] TFTP server does not copy terminating null of filename, Dirk Ziegelmeier, 2017/03/14
- Re: [lwip-devel] [bug #50534] TFTP server does not copy terminating null of filename, Axel Lin, 2017/03/14
- Re: [lwip-devel] [bug #50534] TFTP server does not copy terminating null of filename,
Sylvain Rochet <=