tcpdump mailing list archives
Re: Fix print-pflog.c
From: Michael Richardson <mcr () sandelman ca>
Date: Wed, 31 Mar 2010 15:39:08 -0400
"Guy" == Guy Harris <guy () alum mit edu> writes:
Guy> On Mar 31, 2010, at 6:41 AM, Wesley Shields wrote: >> Looks like commit e8b523758959c1854689d71c7a4686c631e5501c broke >> tcpdump on FreeBSD (and probably any other system with PF). The attached >> patch fixes the build. Guy> Checked into the main branch and, it appears, into the 4.1 branch - I did, in a branch tracking the 4.1 branch, a pull to get the change into the repository, a cherry-pick to get that change into the branch, and a push, but Git gave one of its usual WTF-style errors: Guy> $ git push Guy> Counting objects: 7, done. Guy> Delta compression using 2 threads. Guy> Compressing objects: 100% (4/4), done. Guy> Writing objects: 100% (4/4), 473 bytes, done. Guy> Total 4 (delta 3), reused 0 (delta 0) Guy> To git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump Guy> c2ccd65..e4773d6 tcpdump_4.1 -> tcpdump_4.1 Guy> ! [rejected] master -> master (non-fast forward) Guy> error: failed to push some refs to 'git+ssh://bpf.tcpdump.org/tcpdump/master/git/tcpdump' Your master branch is behind, and can not be pushed, but your tcpdump_4.1 branch is okay. Guy> I have no idea what it failed to push, but it appears to have Guy> pushed your change, I guess. I used my usual technique for Guy> dealing with Git weirdness, namely tossing out my repository Guy> (the one tracking the branch, in this case), and recreating it Guy> with git clone/git checkout -b, and the change appears to be Guy> there.- Just: git checkout master git pull -- ] He who is tired of Weird Al is tired of life! | firewalls [ ] Michael Richardson, Sandelman Software Works, Ottawa, ON |net architect[ ] mcr () sandelman ottawa on ca http://www.sandelman.ottawa.on.ca/ |device driver[ Kyoto Plus: watch the video <http://www.youtube.com/watch?v=kzx1ycLXQSE> then sign the petition. - This is the tcpdump-workers list. Visit https://cod.sandelman.ca/ to unsubscribe.
Current thread:
- Fix print-pflog.c Wesley Shields (Mar 31)
- Re: Fix print-pflog.c Michael Richardson (Mar 31)
- Re: Fix print-pflog.c Guy Harris (Mar 31)
- Re: Fix print-pflog.c Wesley Shields (Mar 31)
- Re: Fix print-pflog.c Guy Harris (Mar 31)
- Re: Fix print-pflog.c Guy Harris (Mar 31)
- Re: Fix print-pflog.c Michael Richardson (Mar 31)
- Re: Fix print-pflog.c Michael Richardson (Mar 31)