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