Merging PR #272 caused fatal: refusing to merge unrelated histories

[mohamed-barakat]

Merging PR #272 and rebuilding GAP

(v1.1) pkg> build GAP

caused the following error:

From https://github.com/gap-system/gap
 * branch            master     -> FETCH_HEAD
 + f7f36d7...f9ffeda master     -> origin/master  (forced update)
fatal: refusing to merge unrelated histories
ERROR: LoadError: failed process: Process(`git pull --depth=1 origin master`, ProcessExited(128)) [128]
Stacktrace:
 [1] error(::String, ::Base.Process, ::String, ::Int64, ::String) at ./error.jl:42
 [2] pipeline_error at ./process.jl:785 [inlined]
 [3] #run#515(::Bool, ::Function, ::Cmd) at ./process.jl:726
 [4] run(::Cmd) at ./process.jl:724
 [5] top-level scope at ~/.julia/dev/GAP/deps/build.jl:30
 [6] include at ./boot.jl:326 [inlined]
 [7] include_relative(::Module, ::String) at ./loading.jl:1038
 [8] include(::Module, ::String) at ./sysimg.jl:29
 [9] include(::String) at ./client.jl:403
 [10] top-level scope at none:0
in expression starting at ~/.julia/dev/GAP/deps/build.jl:23
gap_root = ~/.julia/dev/GAP/gap
extra_gap_root = ~/.julia/dev/GAP/
install_gap = true
Installing GAP ...

I worked around it by invoking

git pull --depth=1 origin master --rebase

in ~/.julia/dev/GAP/gap.

[fingolfin]

Using --depth=1 like that is very problematic, because, well, we discard all history -- so of course it can't really merge it. To fix this, it probably suffices to get rid of all --depth arguments to git. And of course switching to a release version of GAP like 4.10.2, would also get rid of this problem.

[mohamed-barakat]

Yes, I am in favour of getting a stable release with documentations already created.

[fingolfin]

I believe this will is fixed (at least for fresh installations) by PR #274, which already has been merged.