gopass icon indicating copy to clipboard operation
gopass copied to clipboard

Do not create commits during `setup` with specified remote

Open apprehensions opened this issue 2 months ago • 0 comments

Summary

When running gopass setup and supplying a remote, gopass by itself makes two commits, which makes the upstream remote's history conflict with the ones gopass made.

Steps To Reproduce

  1. gopass setup with a remote WITH history
  2. Observe as gopass fails to setup
❓ Do you want to add a git remote? [y/N/q]: y
Configuring the git remote ...
Please enter the git remote for your shared store [[REDACTED]]: 
2024/06/22 17:14:35 failed to setup git remote: failed to push to git remote: exit status 1: To [REDACTED]
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to [REDACTED]
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. If you want to integrate the remote changes,
hint: use 'git pull' before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Expected behavior

gopass doesn't make conflicting history.

apprehensions avatar Jun 22 '24 14:06 apprehensions