pie_ has quit [Ping timeout: 248 seconds]
pie_ has joined ##openfpga
thallia has quit [Ping timeout: 240 seconds]
thallia has joined ##openfpga
futarisIRCcloud has quit [Quit: Connection closed for inactivity]
Dolu has quit [Ping timeout: 264 seconds]
G33KatWork has quit [Ping timeout: 240 seconds]
wolfspraul has quit [Ping timeout: 240 seconds]
Prf_Jakob has quit [Ping timeout: 240 seconds]
wolfspraul has joined ##openfpga
G33KatWork has joined ##openfpga
esden has quit [Ping timeout: 240 seconds]
esden has joined ##openfpga
Prf_Jakob has joined ##openfpga
thallia has quit [Ping timeout: 240 seconds]
thallia has joined ##openfpga
GenTooMan has joined ##openfpga
pie_ has quit [Ping timeout: 248 seconds]
thallia has quit [Ping timeout: 256 seconds]
futarisIRCcloud has joined ##openfpga
soylentyellow has quit [Ping timeout: 260 seconds]
<digshadow> azonenberg: in vivado I have some nets without cell pins
<digshadow> do you know what might cause that?
soylentyellow has joined ##openfpga
soylentyellow has quit [Ping timeout: 240 seconds]
GenTooMan has quit [Quit: Leaving]
soylentyellow has joined ##openfpga
digshadow has quit [Ping timeout: 255 seconds]
rohitksingh_work has joined ##openfpga
gnufan has quit [Ping timeout: 248 seconds]
digshadow has joined ##openfpga
gnufan has joined ##openfpga
DocScrutinizer05 is now known as DSC050
DSC050 is now known as DocScrutinizer05
zino has joined ##openfpga
zino has quit [Ping timeout: 248 seconds]
rohitksingh_wor1 has joined ##openfpga
rohitksingh_work has quit [Ping timeout: 248 seconds]
Bike has quit [Quit: Lost terminal]
zino has joined ##openfpga
<azonenberg> digshadow: um
<azonenberg> no
<azonenberg> never seen that before
DocScrutinizer05 has quit [Disconnected by services]
DocScrutinizer05 has joined ##openfpga
pie_ has joined ##openfpga
pie_ has quit [Ping timeout: 240 seconds]
mumptai has joined ##openfpga
soylentyellow has quit [Ping timeout: 255 seconds]
pie_ has joined ##openfpga
ym has quit [Read error: Connection reset by peer]
ym has joined ##openfpga
<rqou> wow, jupyter's "export pdf via latex" option just totally doesn't work
<rqou> this time it just silently stripped out all my images
<rqou> also i really really like PLECS
<rqou> rpc-controllable simulators ftw
digshadow has quit [Ping timeout: 256 seconds]
digshadow has joined ##openfpga
mumptai has quit [Remote host closed the connection]
Prf_Jakob has quit [Changing host]
Prf_Jakob has joined ##openfpga
futarisIRCcloud has quit [Quit: Connection closed for inactivity]
eduardo__ has joined ##openfpga
eduardo_ has quit [Ping timeout: 265 seconds]
Dolu has joined ##openfpga
futarisIRCcloud has joined ##openfpga
Dolu has quit [Ping timeout: 256 seconds]
m_t has joined ##openfpga
rohitksingh_wor1 has quit [Read error: Connection reset by peer]
futarisIRCcloud has quit [Quit: Connection closed for inactivity]
rohitksingh1 has joined ##openfpga
rohitksingh1 has quit [Quit: Leaving.]
indy has quit [Quit: ZNC - http://znc.sourceforge.net]
indy has joined ##openfpga
Ishan_Bansal has quit []
Ishan_Bansal has joined ##openfpga
jeandet has quit []
jeandet has joined ##openfpga
genii has joined ##openfpga
pie__ has joined ##openfpga
pie_ has quit [Remote host closed the connection]
pie__ has quit [Ping timeout: 260 seconds]
Dolu has joined ##openfpga
azonenberg_work has quit [Ping timeout: 265 seconds]
m_t has quit [Quit: Leaving]
DocScrutinizer05 has quit [Disconnected by services]
DocScrutinizer05 has joined ##openfpga
azonenberg_work has joined ##openfpga
kristianpaul has quit [Quit: Lost terminal]
kristianpaul has joined ##openfpga
azonenberg_work has quit [Ping timeout: 264 seconds]
user10032 has joined ##openfpga
azonenberg_work has joined ##openfpga
digshadow has quit [Ping timeout: 256 seconds]
digshadow has joined ##openfpga
mumptai has joined ##openfpga
m_t has joined ##openfpga
pie__ has joined ##openfpga
soylentyellow has joined ##openfpga
mumptai_ has joined ##openfpga
<eduardo__> These days all the chips are sent to china and you get back your netlist within 4 weeks. This does cost you about 50k USD. So these days no professional attacker does decaping themself anymore.
<eduardo__> rqou: I would want to ask you a favour you can do easily.
<eduardo__> Could you get a ice40UP5k and a ice40UP3k and look if they are the same die ?
<eduardo__> I mean look under the microscope?
<eduardo__> David is 99% sure, but he is looking for confirmation.
<cr1901_modern> >So these days no professional attacker does decaping themself anymore
<cr1901_modern> What a shame :(...
soylentyellow has quit [Ping timeout: 255 seconds]
mumptai_ has quit [Quit: Verlassend]
soylentyellow has joined ##openfpga
gnufan has quit [Ping timeout: 256 seconds]
unixb0y has joined ##openfpga
<unixb0y> hello everybody!
<unixb0y> is digshadow here?
<digshadow> unixb0y: hey
<unixb0y> I did the rebase but GitHub doesn't like it
<digshadow> let me take a look
<unixb0y> Do I have to close the pull request and do a new one?
<digshadow> I don't see it updated
<digshadow> did you push the update to your branch?
<unixb0y> yeah I did
<unixb0y> Maybe I did a mistake
<unixb0y> oops
<unixb0y> 1 second
gnufan has joined ##openfpga
<unixb0y> the rebase has worked, and it shows up fine in my repo
<unixb0y> but in the pull request, the commits still show up one-by-one.
<digshadow> link to your repo?
gnufan has quit [Ping timeout: 240 seconds]
user10032 has quit [Quit: Leaving]
GenTooMan has joined ##openfpga
futarisIRCcloud has joined ##openfpga
<digshadow> looking at that
<digshadow> I see your commit history still shows it not squashed
gnufan has joined ##openfpga
<unixb0y> well it is. there is the merged pull request from earlier and then 3 commits which all include the sign-off
<unixb0y> one of the 3 was the squash, one was the merge with the origin and the third was an error ;) still all include the sign-offf
<digshadow> I still see your readme commits, and they are missing the sign off
<digshadow> I don't think you did the squash, or at least not what you were intending to do
<unixb0y> on yes that's right... This is weird
<digshadow> Can you walk through that with me right now and retry it?
<unixb0y> Maybe I used the wrong hash
<unixb0y> sure
<digshadow> first, can you confirm the branch master on there is the one on your terminal?
<digshadow> that is, your git branch -avv shows 3d9ca915ebddc026dbcd32cf5b30025285255b78
<digshadow> as master
<digshadow> which is the branch you are on
<unixb0y> I'm on master
<digshadow> (or the prefix of that anyway)
<digshadow> what git hash does it show?
<unixb0y> 3d9ca91
<digshadow> perfect
<digshadow> okay now run
<digshadow> git rebase -i 46c1eef15b49241a89909a79a8b7182b315f399e^1
<digshadow> this will start an interactive rebase to let you start squashing things together
<digshadow> on every commit except the very first one, change it to "s" to squash (because you want to squash them into the very first one)
<unixb0y> yup
<unixb0y> the first one will be reword with sign-off right?
<digshadow> it will place all of the commits into a file for you to edit
<digshadow> you'll need to reword that, and yes, it should end with the sign off
<digshadow> commit messages I should say
<unixb0y> ok I put r, ssss......
<unixb0y> now I save that
<unixb0y> it's rebasing
<unixb0y> "This is a combination of 4 commits. ......"
<unixb0y> Clear it or leave it?
<digshadow> ignore the comment lines (those started with #)
<digshadow> they won't make it into the final commit
<unixb0y> yeah I know but the other ones
<digshadow> however, there should be a bunch of non-comment lines
<digshadow> reorganize them into a reasonable commit message
<digshadow> by deleting duplicate lines, etc
<unixb0y> It's a lot of junk tbh because I messed up a little bit with all these rebase things
<unixb0y> sure
<unixb0y> will do so
<digshadow> sure thats fine, so just delete that
<digshadow> and make sure there is one DCO at the end
<digshadow> also re: should I close PR, you don't need to close PRs
<digshadow> to be clear, when you update your branch that you've made the PR against, it will automatically update the PR
<unixb0y> ok!
<unixb0y> perfect
<unixb0y> done
<unixb0y> now git status says:
<unixb0y> your branch and 'origin/master' have diverged and have 1 and 27 different commits each, respectively.
<digshadow> yes, so lets now do a rebase
<digshadow> run this command
<digshadow> git rebase origin/master
<digshadow> well
<unixb0y> done
<digshadow> okay how does it look now
<unixb0y> better
<digshadow> what does it say now
<digshadow> on git status
<unixb0y> all fine
<unixb0y> but github still isn't happy
<digshadow> you tried git push and I'm guessing it rejected it right
<unixb0y> Oh I didn't push yet
<digshadow> oh whats wrong then
<unixb0y> should I push?
<digshadow> yes. unless you push, the changes are only on your system
<unixb0y> It says "Everything up to date"
<unixb0y> I think git rebase origin/master already pushed it
<unixb0y> Or maybe not
<digshadow> I may have made a mistake here
<digshadow> and misunderstood your branch layout
<unixb0y> hmmmmm
<digshadow> lets take a step back
<unixb0y> ok
<unixb0y> no problem ;)
<digshadow> git remote -v
<digshadow> what are your remotes set to?
<digshadow> specifically, what is the main project x-ray repo vs your remote?
<unixb0y> to my repo
<unixb0y> (unixb0y)
<digshadow> okay, sorry that was my bad assumption
<unixb0y> Yeah I did a fork to work on it :)
<digshadow> the rebase made it back to the previous history maybe, which is not what we wanted
<digshadow> we actually wanted to replace that
<unixb0y> yeah
<digshadow> in your git log, does it show the new squashed history?
<digshadow> do you by chance have the git commit name before you did the rebase (ie in your terminal history)?
<unixb0y> nope does not show anything for the last hour approx.
<unixb0y> 1 sec
<digshadow> can you run git reflog --all
<digshadow> and see if you can see the commit you were making before the rebase
<unixb0y> it should be this: 3d9ca915ebddc026dbcd32cf5b30025285255b78
<digshadow> run git rebase --hard 3d9ca915ebddc026dbcd32cf5b30025285255b78
<digshadow> this should reset your master back to that commit
<unixb0y> that command shows a few ones: 3d9ca91, 6d0525c, 3d9ca91, ....
<digshadow> looking back in our chat, 3d9ca915 was the original commit we were trying to squash
<digshadow> I meant the commit name after you squashed
<unixb0y> I don't think I have that
<digshadow> did "git reflog --all" show the squashed commit?
<digshadow> Is it easy for you to re-create it?
<digshadow> it may be easier than trying to find it if you don't see the hash handy
<unixb0y> reflog ... shows this:
<digshadow> that is, re-squash
<unixb0y> 3d9ca91 refs/heads/master@{0}: rebase finished: refs/heads/master onto 3d9ca915ebddc026dbcd32cf5b30025285255b78
<unixb0y> 6d0525c refs/heads/master@{1}: rebase -i (finish): refs/heads/master onto 708622365bebafdd85f11b5033d1e5323cef164c
<unixb0y> 3d9ca91 refs/heads/master@{2}: rebase finished: refs/heads/master onto 3d9ca915ebddc026dbcd32cf5b30025285255b78
<unixb0y> 04db164 refs/heads/master@{3}: rebase -i (finish): refs/heads/master onto f7fb01778bfb26d1d677b6ae8fd4e86292d67a61
<unixb0y> 3d9ca91 refs/heads/master@{4}: pull: Merge made by the 'recursive' strategy.
<unixb0y> f7fb017 refs/heads/master@{5}: rebase -i (finish): refs/heads/master onto 6411a756bbaa429cfe76f2a0508a8309cd918ba4
<unixb0y> c758658 refs/heads/master@{6}: clone: from https://github.com/unixb0y/prjxray.git
<unixb0y> 858f50d
<digshadow> if you do a git log on some of those (say git log 6d0525c)
<digshadow> does it show the squashed commit in the log
<unixb0y> 6d0525c looks like squashed.
<digshadow> okay then do git reset --hard 6d0525c
<unixb0y> ok now?
<digshadow> I'm saying run "git reset --hard 6d0525c"
<digshadow> to make master your squashed state before
<unixb0y> I did
<digshadow> git log looks good?
<unixb0y> yup
<digshadow> maybe we should also move this to pm
<unixb0y> okay
<Ultrasauce> the first time I tried to do that I managed to lose a commit forever
<Ultrasauce> still don't entirely understand how I pulled that off
<unixb0y> Lol
<unixb0y> ¯\_(ツ)_/¯
<unixb0y> We did it \o/
Bike has joined ##openfpga
mumptai has quit [Quit: Verlassend]