diff options
| author | Stefan Haller <stefan@haller-berlin.de> | 2024-06-02 09:05:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-02 09:05:20 +0200 |
| commit | 7c51ec21bf0f787c6f2d0079e920f3d5f566c9f0 (patch) | |
| tree | 2cbcf94a5605bcccd6105cd30ec5dda486aeeb9c /pkg | |
| parent | 205357a44f8ff2b344e87e79fd78313659611c97 (diff) | |
| parent | 39ea5d9ab1e394d626567d4c01713873048e204c (diff) | |
(#3618) Fix pushing a branch to remote with a different name causing error (#3630)
- **PR Description**
This fixes an error where, given the user wants push a branch to a
remote branch with a different name, the following error would be
presented:
```
Error
error: src refspec <desired remote branch name> does not match any
error: failed to push some refs to <remote .git URI>
```
- **Please check if the PR fulfills these requirements**
* [x] Cheatsheets are up-to-date (run `go generate ./...`)
* [x] Code has been formatted (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#code-formatting))
* [x] Tests have been added/updated (see
[here](https://github.com/jesseduffield/lazygit/blob/master/pkg/integration/README.md)
for the integration test guide)
* [x] Text is internationalised (see
[here](https://github.com/jesseduffield/lazygit/blob/master/CONTRIBUTING.md#internationalisation))
* [x] Docs have been updated if necessary
* [x] You've read through your own file changes for silly mistakes etc
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/commands/git_commands/sync.go | 2 | ||||
| -rw-r--r-- | pkg/commands/git_commands/sync_test.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkg/commands/git_commands/sync.go b/pkg/commands/git_commands/sync.go index 1c93fc260..7ab209c0e 100644 --- a/pkg/commands/git_commands/sync.go +++ b/pkg/commands/git_commands/sync.go @@ -35,7 +35,7 @@ func (self *SyncCommands) PushCmdObj(task gocui.Task, opts PushOpts) (oscommands ArgIf(opts.ForceWithLease, "--force-with-lease"). ArgIf(opts.SetUpstream, "--set-upstream"). ArgIf(opts.UpstreamRemote != "", opts.UpstreamRemote). - ArgIf(opts.UpstreamBranch != "", opts.UpstreamBranch). + ArgIf(opts.UpstreamBranch != "", "HEAD:"+opts.UpstreamBranch). ToArgv() cmdObj := self.cmd.New(cmdArgs).PromptOnCredentialRequest(task) diff --git a/pkg/commands/git_commands/sync_test.go b/pkg/commands/git_commands/sync_test.go index 6ff8da840..353ac72aa 100644 --- a/pkg/commands/git_commands/sync_test.go +++ b/pkg/commands/git_commands/sync_test.go @@ -48,7 +48,7 @@ func TestSyncPush(t *testing.T) { UpstreamBranch: "master", }, test: func(cmdObj oscommands.ICmdObj, err error) { - assert.Equal(t, cmdObj.Args(), []string{"git", "push", "origin", "master"}) + assert.Equal(t, cmdObj.Args(), []string{"git", "push", "origin", "HEAD:master"}) assert.NoError(t, err) }, }, @@ -61,7 +61,7 @@ func TestSyncPush(t *testing.T) { SetUpstream: true, }, test: func(cmdObj oscommands.ICmdObj, err error) { - assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--set-upstream", "origin", "master"}) + assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--set-upstream", "origin", "HEAD:master"}) assert.NoError(t, err) }, }, @@ -74,7 +74,7 @@ func TestSyncPush(t *testing.T) { SetUpstream: true, }, test: func(cmdObj oscommands.ICmdObj, err error) { - assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--force-with-lease", "--set-upstream", "origin", "master"}) + assert.Equal(t, cmdObj.Args(), []string{"git", "push", "--force-with-lease", "--set-upstream", "origin", "HEAD:master"}) assert.NoError(t, err) }, }, |