Don't clobber the user's upstream settings (#26486)
It's not clobbering time :( Release Notes: - Git Beta: Fixed a bug where our push button would always overwrite the current branch's upstream
This commit is contained in:
parent
7019aca59d
commit
fd7ab20ea4
1 changed files with 11 additions and 3 deletions
|
@ -1706,10 +1706,18 @@ impl GitPanel {
|
|||
};
|
||||
telemetry::event!("Git Pushed");
|
||||
let branch = branch.clone();
|
||||
|
||||
let options = if force_push {
|
||||
PushOptions::Force
|
||||
Some(PushOptions::Force)
|
||||
} else {
|
||||
PushOptions::SetUpstream
|
||||
match branch.upstream {
|
||||
Some(Upstream {
|
||||
tracking: UpstreamTracking::Gone,
|
||||
..
|
||||
})
|
||||
| None => Some(PushOptions::SetUpstream),
|
||||
_ => None,
|
||||
}
|
||||
};
|
||||
let remote = self.get_current_remote(window, cx);
|
||||
|
||||
|
@ -1739,7 +1747,7 @@ impl GitPanel {
|
|||
repo.push(
|
||||
branch.name.clone(),
|
||||
remote.name.clone(),
|
||||
Some(options),
|
||||
options,
|
||||
askpass_delegate,
|
||||
cx,
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue