upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/bin
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/git_remote_nostr/push.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs
index 4066312..93127fb 100644
--- a/src/bin/git_remote_nostr/push.rs
+++ b/src/bin/git_remote_nostr/push.rs
@@ -1104,11 +1104,11 @@ async fn create_merge_events(
1104 } else { 1104 } else {
1105 None 1105 None
1106 }, 1106 },
1107 if merged_patches 1107 if let Some((commit, _)) = merged_patches
1108 .values() 1108 .iter()
1109 .any(|m| m == &MergedPRCommitType::MergeCommit) 1109 .find(|(_, m)| **m == MergedPRCommitType::MergeCommit)
1110 { 1110 {
1111 vec![*merged_patches.keys().next().unwrap()] 1111 vec![*commit]
1112 } else { 1112 } else {
1113 let mut t: Vec<Sha1Hash> = merged_patches.keys().copied().collect(); 1113 let mut t: Vec<Sha1Hash> = merged_patches.keys().copied().collect();
1114 t.reverse(); 1114 t.reverse();