search

mcr / tcpdump

the TCPdump network dissector. now moved to:
https://github.com/the-tcpdump-group/tcpdump
Other
84 stars 2 forks source link

Forgot to add name to CREDITS File... #26

Closed dogbert2 closed 12 years ago

dogbert2 commented 12 years ago

Added name to credits on supplied patch which was merged to the TCPDump master a couple of days ago. Forgot to update the CREDITS file initially.

infrastation commented 12 years ago

You are overwriting the whole file again.

dogbert2 commented 12 years ago

When I see the Diff on the Windows GitHub, It only showed the differences and not the entire file (I changed the core.autocrlf variable in .gitattributes to compensate for this)?

Bill

On Thu, Sep 6, 2012 at 11:33 PM, Denis Ovsienko notifications@github.comwrote:

You are overwriting the whole file again.

— Reply to this email directly or view it on GitHubhttps://github.com/mcr/tcpdump/pull/26#issuecomment-8357247.

infrastation commented 12 years ago

Since tcpdump was originally developed for UNIX systems, its source tree uses UNIX newlines. The rest isn't actually tcpdump-specific.

Your Windows text editor is silently switching the newlines to DOS, effectively changing every line of the file, and Windows git client is hiding that from you. If you want to put an end to it, either get an editor and the git client that never mess UNIX newlines up in Windows, or use a cheap Linux host (even a virtual machine would do) to make/verify your commits before pushing to GitHub, or at least examine the commit on GitHub before placing the pull request (GitHub clearly indcates you are overwriting the whole file).

Thanks.

dogbert2 commented 12 years ago

I'm using GVim 7.3 and in the file which github references for editing, I inserted:

set fileformat=unix

into vimrc, which hopefully should stop the problem...now to see if any other silly vimrc's are hanging around on the hard disk...meh.

Bill

On Sat, Sep 8, 2012 at 1:42 AM, Denis Ovsienko notifications@github.comwrote:

Since tcpdump was originally developed for UNIX systems, its source tree uses UNIX newlines. The rest isn't actually tcpdump-specific.

Your Windows text editor is silently switching the newlines to DOS, effectively changing every line of the file, and Windows git client is hiding that from you. If you want to put an end to it, either get an editor and the git client that never mess UNIX newlines up in Windows, or use a cheap Linux host (even a virtual machine would do) to make/verify your commits before pushing to GitHub, or at least examine the commit on GitHub before placing the pull request (GitHub clearly indcates you are overwriting the whole file).

Thanks.

— Reply to this email directly or view it on GitHubhttps://github.com/mcr/tcpdump/pull/26#issuecomment-8385717.

dogbert2 commented 12 years ago

Closing this commit and trying again...