Skip to content

Commit a6f9d4a

Browse files
estib-vegaestib-vega
authored
Merge pull request #9866 from gitbutlerapp/push-force-required-for-upstream-commits
fix: Push status - If there are remote commits, force push is required
2 parents 878bec8 + 64b2696 commit a6f9d4a

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

‎crates/but-workspace/src/changeset.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,12 @@ impl PushStatus {
244244
&& matches!(c.relation, LocalCommitRelation::Integrated(_)))
245245
}) {
246246
PushStatus::UnpushedCommitsRequiringForce
247+
} else if remote_has_commits {
248+
// If there are remote commits, pushing would require a force push, as the remote-only
249+
// commits would be overwritten.
250+
PushStatus::UnpushedCommitsRequiringForce
247251
} else if first_commit_is_local {
248-
if remote_has_commits {
249-
PushStatus::UnpushedCommitsRequiringForce
250-
} else {
251-
PushStatus::UnpushedCommits
252-
}
252+
PushStatus::UnpushedCommits
253253
} else {
254254
PushStatus::NothingToPush
255255
}

‎crates/but-workspace/tests/workspace/ref_info/with_workspace_commit/journey/integrate_with_merges.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ fn remote_ahead() -> anyhow::Result<()> {
492492
],
493493
commits_outside: None,
494494
metadata: "None",
495-
push_status: NothingToPush,
495+
push_status: UnpushedCommitsRequiringForce,
496496
base: "fafd9d0",
497497
},
498498
],

‎crates/but-workspace/tests/workspace/ref_info/with_workspace_commit/legacy.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ mod stack_details {
347347
review_id: None,
348348
tip: Sha1(d79bba960b112dbd25d45921c47eeda22288022b),
349349
base_commit: Sha1(c166d42d4ef2e5e742d33554d03805cfb0b24d11),
350-
push_status: NothingToPush,
350+
push_status: UnpushedCommitsRequiringForce,
351351
last_updated_at: None,
352352
authors: [
353353
author <[email protected]>,
@@ -404,7 +404,7 @@ mod stack_details {
404404
review_id: None,
405405
tip: Sha1(d79bba960b112dbd25d45921c47eeda22288022b),
406406
base_commit: Sha1(c166d42d4ef2e5e742d33554d03805cfb0b24d11),
407-
push_status: NothingToPush,
407+
push_status: UnpushedCommitsRequiringForce,
408408
last_updated_at: None,
409409
authors: [
410410
author <[email protected]>,

‎crates/but-workspace/tests/workspace/ref_info/with_workspace_commit/mod.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ fn remote_ahead_fast_forwardable() -> anyhow::Result<()> {
6868
],
6969
commits_outside: None,
7070
metadata: Branch,
71-
push_status: NothingToPush,
71+
push_status: UnpushedCommitsRequiringForce,
7272
base: "c166d42",
7373
},
7474
],
@@ -127,7 +127,7 @@ fn remote_ahead_fast_forwardable() -> anyhow::Result<()> {
127127
],
128128
commits_outside: None,
129129
metadata: Branch,
130-
push_status: NothingToPush,
130+
push_status: UnpushedCommitsRequiringForce,
131131
base: "c166d42",
132132
},
133133
],
@@ -190,7 +190,7 @@ fn remote_ahead_fast_forwardable() -> anyhow::Result<()> {
190190
],
191191
commits_outside: None,
192192
metadata: Branch,
193-
push_status: NothingToPush,
193+
push_status: UnpushedCommitsRequiringForce,
194194
base: "c166d42",
195195
},
196196
],
@@ -2628,7 +2628,7 @@ fn multiple_branches_with_shared_segment() -> anyhow::Result<()> {
26282628
],
26292629
commits_outside: None,
26302630
metadata: "None",
2631-
push_status: NothingToPush,
2631+
push_status: UnpushedCommitsRequiringForce,
26322632
base: "c166d42",
26332633
},
26342634
],
@@ -2666,7 +2666,7 @@ fn multiple_branches_with_shared_segment() -> anyhow::Result<()> {
26662666
],
26672667
commits_outside: None,
26682668
metadata: "None",
2669-
push_status: NothingToPush,
2669+
push_status: UnpushedCommitsRequiringForce,
26702670
base: "c166d42",
26712671
},
26722672
],
@@ -2738,7 +2738,7 @@ fn multiple_branches_with_shared_segment() -> anyhow::Result<()> {
27382738
],
27392739
commits_outside: None,
27402740
metadata: "None",
2741-
push_status: NothingToPush,
2741+
push_status: UnpushedCommitsRequiringForce,
27422742
base: "c166d42",
27432743
},
27442744
],
@@ -2776,7 +2776,7 @@ fn multiple_branches_with_shared_segment() -> anyhow::Result<()> {
27762776
],
27772777
commits_outside: None,
27782778
metadata: "None",
2779-
push_status: NothingToPush,
2779+
push_status: UnpushedCommitsRequiringForce,
27802780
base: "c166d42",
27812781
},
27822782
],
@@ -2848,7 +2848,7 @@ fn multiple_branches_with_shared_segment() -> anyhow::Result<()> {
28482848
],
28492849
commits_outside: None,
28502850
metadata: "None",
2851-
push_status: NothingToPush,
2851+
push_status: UnpushedCommitsRequiringForce,
28522852
base: "c166d42",
28532853
},
28542854
],
@@ -2886,7 +2886,7 @@ fn multiple_branches_with_shared_segment() -> anyhow::Result<()> {
28862886
],
28872887
commits_outside: None,
28882888
metadata: "None",
2889-
push_status: NothingToPush,
2889+
push_status: UnpushedCommitsRequiringForce,
28902890
base: "c166d42",
28912891
},
28922892
],
@@ -2959,7 +2959,7 @@ fn multiple_branches_with_shared_segment() -> anyhow::Result<()> {
29592959
],
29602960
commits_outside: None,
29612961
metadata: "None",
2962-
push_status: NothingToPush,
2962+
push_status: UnpushedCommitsRequiringForce,
29632963
base: "c166d42",
29642964
},
29652965
],
@@ -2997,7 +2997,7 @@ fn multiple_branches_with_shared_segment() -> anyhow::Result<()> {
29972997
],
29982998
commits_outside: None,
29992999
metadata: "None",
3000-
push_status: NothingToPush,
3000+
push_status: UnpushedCommitsRequiringForce,
30013001
base: "c166d42",
30023002
},
30033003
],

0 commit comments

Comments
 (0)