GIT Raft Questions - Git to Otter then Otter to Git

[Chris Franco]

Hey,

Followed your documentation on how to hook up Otter to Git as it's described.

1. Set up empty Repository on our SCM with the 'Default.zip' set to the root of the drive on the master branch.

2. Made a change in Otter, checked our SCM and there was indeed a commit and push to the server performed by Otter.

3. Pushed directly to Master as a regular user to have Otter 'sync' the changes made on the GIT server.

From here I was met with the following error:

An error occurred in the web application: Cannot push non-fastforwardable reference

URL: http://vmotter05:82/plans/create?raftId=4&planType=OrchestrationPlan
Referrer: http://vmotter05:82/plans/create?raftId=4&planType=OrchestrationPlan
User: Express User
User Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/61.0.3163.100 Safari/537.36
Stack trace: at LibGit2Sharp.Core.Ensure.HandleError(Int32 result)
at LibGit2Sharp.Core.Proxy.git_remote_push(RemoteSafeHandle remote, IEnumerable1 refSpecs, GitPushOptions opts) at LibGit2Sharp.Network.Push(Remote remote, IEnumerable1 pushRefSpecs, PushOptions pushOptions)
at LibGit2Sharp.Network.Push(IEnumerable`1 branches, PushOptions pushOptions)
at Inedo.Otter.WebApplication.Pages.Plans.CreatePlanPage.<>c__DisplayClass10_0.<CreateChildControls>b__0(Object s, EventArgs e)
at Inedo.Web.Controls.ButtonLinks.PostBackButtonLink.System.Web.UI.IPostBackEventHandler.RaisePostBackEvent(String eventArgument)
at System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)

I believe there's something wrong with the local copy of the repo that Otter is using but there's no-where that it's storing it on the server that I can see. There's nothing for me to really debug and given it's throwing the same error each time not sure how to proceed..

Thanks

Product: Otter
Version: 1.7.3

[ben]

Hello Chris,

By default, Git rafts are stored in C:\ProgramData\Otter\Executions\GitRafts[raftname] as bare repositories.

I don't think Otter git raft repositories will automatically download changes made outside of Otter - to pull the remote changes in this case, you could use the command git fetch origin master:master while inside the bare repository.

[ben]

Looking deeper, I see that the raft repositories are supposed to automatically download changes, but that functionality is broken. I've filed this as OT-183 and also fixed the related bugs OT-184 and OT-185.