« WTF
git hiccups

emanuele

  • Posts: 125

forumsearch0r

  • Posts: 118

Nao

  • Dadman with a boy
  • Posts: 16,079
Re: git hiccups
« Reply #2, on October 21st, 2013, 06:21 PM »
Quote from emanuele on October 21st, 2013, 02:35 PM
Quote from Nao on October 20th, 2013, 04:26 PM
Fact is, all he's been doing at SMF 2.1 is adding features that are taken STRAIGHT from Wedge. In fact, some of his commits (look at his 05be2b92 revert) have Wedge code in them, such as wesql::query, if proof was needed that he didn't just take his 'ideas', he was taking his code, too.
Wrong subject:
https://github.com/SimpleMachines/SMF2.1/pull/691/files#diff-cfc225eff5aeb11b2e42d1a705c3ae63R476
That page shows a commit by Arantor. Why does it also say live627:ssi? Is this some kind of gitty trick?
If it's a commit by John, why is Pete credited for it..?
And if it is, why does he use Wedge terminology, when he's made very clear (by his silence mostly!) that he chose not to keep working on the Wedge codebase?
Re: git hiccups
« Reply #3, on October 21st, 2013, 06:24 PM »
Quote from forumsearch0r on October 21st, 2013, 02:50 PM
Quote from Nao on October 21st, 2013, 12:50 PM
- Indenazi hack. Only executed if used in a skin.
Sounds neat. What is it?
Nothing more than a vanity hack... It allows the skinner to fine-tune tabs (spaces) per-block in the HTML source code. I wrote it for use within skins that would want to move around the sidebar, like Warm did, but it's lost some of its value by now. Plus, I'm the only one around who cares about HTML formatting, so, whatever... Not worth discussing, really, it's only for the anally retentive like me ;)
Quote
Ah, good old UBB, YaBB and, ehm... PHP-Nuke days.
Ah, PHP Nuke, and its 'successor' PostNuke... I actually tried to build a website using those, back in the day...! (I ended up using SPIP, which had the better codebase; the website is still live, surprisingly.)

forumsearch0r

  • Posts: 118
Re: git hiccups
« Reply #4, on October 21st, 2013, 06:27 PM »
HTML formatting is a great Plus when you have mixed contents (like HTML and PHP) which sometimes is hard to avoid IMO.

Nao

  • Dadman with a boy
  • Posts: 16,079
Re: git hiccups
« Reply #5, on October 21st, 2013, 06:41 PM »
Well, it's in the final page, not before... (?)

forumsearch0r

  • Posts: 118
Re: git hiccups
« Reply #6, on October 21st, 2013, 06:50 PM »
Hm, OK. At least that's nice for debugging. :D

TE

  • Posts: 286
Re: git hiccups
« Reply #7, on October 21st, 2013, 07:13 PM »
Quote
That page shows a commit by Arantor. Why does it also say live627:ssi? Is this some kind of gitty trick?
If it's a commit by John, why is Pete credited for it..?
Nope, it's a commit from live627 .. his branch was named "ssi". Arantor was the one who merged it.

https://github.com/SimpleMachines/SMF2.1/pull/691
Thorsten "TE" Eurich - Former SMF Developer & Converters Guru

emanuele

  • Posts: 125
Re: git hiccups
« Reply #8, on October 21st, 2013, 08:57 PM »
Quote from Nao on October 21st, 2013, 06:21 PM
That page shows a commit by Arantor. Why does it also say live627:ssi? Is this some kind of gitty trick?
If it's a commit by John, why is Pete credited for it..?
And if it is, why does he use Wedge terminology, when he's made very clear (by his silence mostly!) that he chose not to keep working on the Wedge codebase?
The commit you posted was by Arantor to fix live's commit (that I linked) with Wedge-like syntax.

Ops, didn't see TE's post.

live627

  • Should five per cent appear too small / Be thankful I don't take it all / 'Cause I'm the taxman, yeah I'm the taxman
  • Posts: 1,670
Re: git hiccups
« Reply #9, on October 22nd, 2013, 12:21 AM »
Wait, now I can't submit fixes to SMF?

I get the feeling that Nao thinks everyone has turned against him and that someone, somewhere has declared war. Are we schoolboys that fight at every chance we get?
A confident man keeps quiet.whereas a frightened man keeps talking, hiding his fear.

Nao

  • Dadman with a boy
  • Posts: 16,079
Re: git hiccups
« Reply #10, on October 22nd, 2013, 09:45 AM »
Quote from TE on October 21st, 2013, 07:13 PM
Quote
That page shows a commit by Arantor. Why does it also say live627:ssi? Is this some kind of gitty trick?
If it's a commit by John, why is Pete credited for it..?
Nope, it's a commit from live627 .. his branch was named "ssi". Arantor was the one who merged it.

https://github.com/SimpleMachines/SMF2.1/pull/691
<sigh>
From what I saw on the Github site, because Arantor 'merged' the commit, and he had his name in bold (while the live627:ssi branch is in small-size Courier New characters), it wasn't hard to imagine that he committed it.

Let's see the path that I followed...

https://github.com/SimpleMachines/
Click SMF 2.1. Brings us to...

https://github.com/SimpleMachines/SMF2.1
Search (ctrl+f) for 'wedge' in the page. The last commit on SSI.php has it, so it's plain in your face (and the reason why I mentioned this thing at all, because I'm afraid I don't spend a lot of time on either Elk and SMF codebases, ahem.)
Click the link. Brings us to...

https://github.com/SimpleMachines/SMF2.1/commit/aec98628cbc78d30a38f2dcf68dfc747740a899f
"Arantor authored 14 days ago"
Click on "1 parent: (hash)", top right of the page. Brings us to...

https://github.com/SimpleMachines/SMF2.1/commit/444bdeac2797b058b2eac26cf756d7c57f2053d9
In the very same place, it says "Arantor authored 14 days ago".

So, believe what you think, but to me, it seemed obvious that Arantor made both commits... It's what Github insists on saying after exactly THREE clicks from the SimpleMachines homepage.

Is Github that fucked up, or is it Pete who did the wrong move and found himself crediting himself for someone else's work?

TE

  • Posts: 286

Nao

  • Dadman with a boy
  • Posts: 16,079
Re: git hiccups
« Reply #12, on October 22nd, 2013, 10:07 AM »
Quote from live627 on October 22nd, 2013, 12:21 AM
Wait, now I can't submit fixes to SMF?
Who said you couldn't?
Quote
I get the feeling that Nao thinks everyone has turned against him and that someone, somewhere has declared war. Are we schoolboys that fight at every chance we get?
Where do you get this feeling? Just because I check on people's work and mention things that are of concern to me, I'm suddenly paranoid?

I'm only asking that anyone with access to the Wedge codebase doesn't use/distribute my code anywhere.
You can do whatever else you want.

Still, I thought all you wanted was for Wedge to switch to Git, so that you could contribute more easily, and yet, after I opened the repo, you didn't comment on it. I sent you an invite, because you're always going to have a slot for you anyway, accept it if you want.
But since I have limited user team space on that repo, I'll still need an answer.

live627

  • Should five per cent appear too small / Be thankful I don't take it all / 'Cause I'm the taxman, yeah I'm the taxman
  • Posts: 1,670
Re: git hiccups
« Reply #13, on October 22nd, 2013, 10:32 AM »
I sent in that very patch in 2010. That is my only contribution worth porting to SMF.

I'll get a good Git client installed tomorrow, and accept the invite. I have almost no free time nowadays, might get even busier (yikes!) over the holidays.

Nao

  • Dadman with a boy
  • Posts: 16,079
Re: git hiccups
« Reply #14, on October 22nd, 2013, 10:43 AM »
Quote from TE on October 22nd, 2013, 09:53 AM
Just wanted to make sure Arantor isn't blamed for something he isn't responsible for...
Yeah, he doesn't need that to blame himself... ::)Okay, I got it: from the list of links I gave, you have to click "691" or whatever in the header, and then click on the commit link that's in the first comment, or something. This adds an extra 2 clicks, but then you get the original commit[1].

So, basically, Github is the culprit here for not being very helpful to people who might read these pages without knowing a thing about Git or Github or whatever. Regarding the argument about the use of 'wesql' in the codebase, this obviously makes it moot, but that still doesn't change the fact that (and even Arantor recognizes it himself) all of his work on SMF 2.1 is to bring Wedge features to it, which *obviously* is reason enough for me to be pissed off by his actions.

Remember, two months ago, he argued that he was leaving the forum software community to focus on making use of the Unity engine and create video games with Asgard. Something I could perfectly understand; in fact, the only times I considered leaving Wedge, was because I figured I needed to do something to make a living. Well, in the end, not only did Pete stay in this little world, but worse, he chose to go to the only place we expected each other never to deal with. The very place that had us create Wedge in the first place. And not only that, but now he's contributing his Wedge code to them (thus removing value from the project he poured his heart into for three years). He's shooting himself in the foot, wasting his time, and hurting me. Had I left Wedge before him, I'd never have done that kind of deal. I have a fucking conscience. All code I wrote for the team, is for use within the team only, at least until the day Wedge uses an actual open source license, at which point, everyone have fun. I don't have any right to reuse it for the competitor we left in the first place because of the way they treated us[2].

All I'm saying is that I feel Pete disrespected me, by systematically doing the opposite of what he assured me he would do. So, the next things I'm expecting, are for (1) his Wedge repos to disappear without warning (reason enough to move them), and (2) for my code to find itself in SMF. "By mistake", of course. But there will always be a revision log to make sure not a single line of my Wedge code finds itself in SMF. So, now what I'm *hoping* for (rather than expecting), is for Pete to take a local copy of Wedge, and only copy-paste code from HIS revisions.

That's all there is to say.
 1. I thought that branches in Git allowed for pull requests to essentially be a merge, which isn't destructive like a rebase, and kept all of the original commits. Looks like it creates an extra reference to the same commit, with a different hash. Oh, I have to read more about that...
 2. Again: I have nothing against the current SMF dev team. I'm referring to the remainders of the 2010 SMF 'management'.