obelisk icon indicating copy to clipboard operation
obelisk copied to clipboard

Ob thunk pack <src> complains about merge issue

Open augyg opened this issue 1 year ago • 0 comments

From running ob thunk pack src -v the command fails with:

This can be resolved by git push -u origin but for some reason it doesn't tell me this, even though I've seen messages in previous pack commands to run this git push command.

Based on git push -u fixing this, there is no actual merge issue IIUC

Running nix-build on ./.obelisk/impl [command]
Creating process: nix-build ./.obelisk/impl -A command --no-out-link
trace: Warning: stdenv.libis deprecated and will be removed in the next release. Please uselib instead. For more information see https://github.com/NixOS/nixpkgs/issues/108938
Handing off to /nix/store/jlzk6rwi7zgkblzlijaf7c1467ff5jnd-obelisk-command-0.9.0.1/bin/ob
Starting Obelisk </nix/store/jlzk6rwi7zgkblzlijaf7c1467ff5jnd-obelisk-command-0.9.0.1/bin/.ob-wrapped> args=["--no-handoff","thunk","pack","src","-v"] logging-level=Debug
Thunk specification git-v7 matched "src"
Packing thunk src
Ensuring clean git repo at src/
Creating process: /nix/store/gk6k9fryjn0inb2sp5kzqr9zk51mqrl5-git-2.31.1/bin/git -C src/ status --porcelain --ignored
Creating process: /nix/store/gk6k9fryjn0inb2sp5kzqr9zk51mqrl5-git-2.31.1/bin/git -C src/ diff
Creating process: /nix/store/gk6k9fryjn0inb2sp5kzqr9zk51mqrl5-git-2.31.1/bin/git -C src/ stash list
Creating process: /nix/store/gk6k9fryjn0inb2sp5kzqr9zk51mqrl5-git-2.31.1/bin/git -C src/ rev-parse --abbrev-ref HEAD gs/digital-ocean
Creating process: /nix/store/gk6k9fryjn0inb2sp5kzqr9zk51mqrl5-git-2.31.1/bin/git -C src/ rev-parse HEAD a7f856b9fcd636350607c750de8707fe8ec36814
Creating process: /nix/store/gk6k9fryjn0inb2sp5kzqr9zk51mqrl5-git-2.31.1/bin/git -C src/ for-each-ref $'--format=%(refname:short) %(upstream:short) %(upstream:remotename)' refs/heads/
gs/digital-ocean
master origin/master origin
Creating process: /nix/store/gk6k9fryjn0inb2sp5kzqr9zk51mqrl5-git-2.31.1/bin/git -C src/ config --get-all branch.gs/digital-ocean.merge
Alert: Process exited with code 1; /nix/store/gk6k9fryjn0inb2sp5kzqr9zk51mqrl5-git-2.31.1/bin/git -C src/ config --get-all branch.gs/digital-ocean.merge `

This is using the current master branch, so the obelisk thunk where github.json is:

{ "owner": "obsidiansystems", "repo": "obelisk", "branch": "master", "private": false, "rev": "8e942c022ee08ed278bba8f13fdd3be76fc8d8a7", "sha256": "07y1997mh9ycvdmfwm7l1fpscc238bnjyrqpf9jjka4d52aqkw6j" }

augyg avatar Jun 14 '23 20:06 augyg