Git Integration Fails with Different Branch

Hi there,

I'm taking advantage of git integration to develop some different branches. I want to switch between branches when I use my artiq hardware to drive different experimental setups for example.

I maintain a separate repository from that used by artiq-master. When I push this up to my headless master repository however, the dashboard seems to lose the ability to integrate with git. The log window stops working, although the master still spits messages into the console from which I ran it. post-receive hooks also stop working. the script gets executed, but bash can't find the artiq_client command.

The commands I use are something like the following:
git checkout sidebranch
git commit -m "edit the sidebranch"
git push origin sidebranch:master

Where "origin" is the remote located where artiq-master is running and where the hooks directory sits.

Now restarting the dashboard and master will cause the experiments contained in master to appear, but no hooks, and no logs.

Thoughts? Are there some files within artiq that are responsible for enabling git hooks that I'll need to edit?

I've tried making sure that the branch I'm pushing from is also named master, but this doesn't help. I'm definitely not changing the name of the remote branch.

Got it figured out, thanks.

It was a good idea to just start with the inability to find artiq_client. Basically when I was checking out different branches and what not, I was working in gitbash, but normally I use build scripts that run directly in the windows shell. Gitbash is able to perform the pushing and branching, but does not seem to integrate properly with conda, so that the artiq_client call doesn't run.

So for other windows artiq users, don't use gitbash, use the command prompt, it also has the git commands thanks to git for windows, but works with conda as well.