Does not checkout the afterCommit in the cloned repo

[octomike]

Without this addition we are only seeing master checked out.
Are we doing it wrong or was that bug?

[Glavin001]

It uses the after commit from the webhook payload from GitLab, and then checks out that commit at https://github.com/Glavin001/GitLab-Pages/blob/master/routes/webhooks.js#L57
It should only apply when the test passes for if the deployBranch is the branch that has been pushed, see https://github.com/Glavin001/GitLab-Pages/blob/master/routes/webhooks.js#L22-L27

tl;dr

So really it does not even checkout the branch, it checks out the commit that was most recently pushed, and only if that commit lies within that deployBranch.

---

I'll take a look later this week when I get a chance and see if it's a true bug. Could you detail some steps I could use to reproduce? For instance, enable repo for GitLab Pages, set deployBranch to gl-pages, push branch master, notice that it does still change. This would indicate there's a bug in the check at https://github.com/Glavin001/GitLab-Pages/blob/master/routes/webhooks.js#L22-L27

[octomike]

Thanks for the explanation!
But unfortunately it still does not work here.
Is repo.getCommit() implicitly checking out that commit in the tmp folder? Because that's not happening in our installation.

[Glavin001]

Yes, it should be checking that commit out in the clone, which is in the tmp directory.

Could you:

• confirm that https://github.com/Glavin001/GitLab-Pages/blob/master/routes/webhooks.js#L22-L27 is working/not working (use proper deploy branch, use master, etc)
• see if it is properly checking out the commit at https://github.com/Glavin001/GitLab-Pages/blob/master/routes/webhooks.js#L57 (sounds like it is not form your comment above) and then see what afterCommit is at that time (valid?). It may be an issue with NodeGit itself.

[octomike]

• ref equals deployRef ("refs/heads/gl-pages") in https://github.com/Glavin001/GitLab-Pages/blob/master/routes/webhooks.js#L22-L27
• afterCommit is containing the correct sha sum in https://github.com/Glavin001/GitLab-Pages/blob/master/routes/webhooks.js#L57
• but still .tmp/ contains the repo with master checked out and hence jekyll will "build" master

Manually checking it out in .tmp/ works fine. How do I debug that repo.getCommit(afterCommit)[https://github.com/Glavin001/GitLab-Pages/blob/master/routes/webhooks.js#L57] call further?

[Glavin001]

It looks like a NodeGit bug. I've found others, too. See nodegit/nodegit#341 (comment)

They recommend that you discuss with them on their Gitter channel. Let me know if you're able to resolve this and we can fix this for everyone. Thanks!

[octomike]

As suspected.

Hi @octomike! getCommit(sha) simply returns information about a commit in the repo, it doesn’t affect he working directory. ( https://gitter.im/nodegit/nodegit )

[Glavin001]

Well, that explains a lot.. haha. Thanks for looking into that!

[Glavin001]

Use Checkout.tree, see http://www.nodegit.org/#Checkout/function/tree

Thanks to @orderedlist

[octomike]

Meh, the updated pull request doesn't work. Ignore that please :)

[Glavin001]

Does it not checkout the commit still? Bummer. If it's not that then what NodeGit API call?

[octomike]

Tested, works fine. Once they actually implemented what's in the API, you can use the line in the comment. 😸

[Glavin001]

So Checkout.tree is not implemented in NodeGit API yet? I thought that's what was recommended to use.. 😕

[octomike]

Yes, I just asked in their gitter channel.

[Glavin001]

Wow, it's unfortunate that NodeGit is so unusable in it's current state. I may even investigate using exec or spawn as a more viable solution for the time being.

[acao]

Probably because js-git has become so popular! This is a node wrapper for it.

https://www.npmjs.com/package/git-node

[Glavin001]

Great! Then it looks like switching to use jsgit is a good idea.

[Glavin001]

Closing this and moving to #11. I am open to reviewing Pull Requests for #11. Thanks!

[Glavin001]

I think git checkout tree is implemented now!
See nodegit/nodegit#402 and http://www.nodegit.org/api/checkout/#tree

[Glavin001]

I recommend updating GitLab Pages and this should now work. Let me know if there are any other problems. Thanks!