diff options
| author | DanConwayDev <DanConwayDev@protonmail.com> | 2024-12-12 13:53:57 +0000 |
|---|---|---|
| committer | DanConwayDev <DanConwayDev@protonmail.com> | 2024-12-12 13:53:57 +0000 |
| commit | aefaadcdf8891d8fb235f87e14c498016b3fbcef (patch) | |
| tree | 8076c80a5988959ee847948339e1b17d61faed81 /src/bin/git_remote_nostr/push.rs | |
| parent | 5a4402ce83094d797f7c2c8780dbc35e0d738dec (diff) | |
test(push): ff merge commit tag `merge-commit-id`
allow any order of the commit ids
Diffstat (limited to 'src/bin/git_remote_nostr/push.rs')
| -rw-r--r-- | src/bin/git_remote_nostr/push.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs index 93127fb..2921387 100644 --- a/src/bin/git_remote_nostr/push.rs +++ b/src/bin/git_remote_nostr/push.rs | |||
| @@ -1110,6 +1110,7 @@ async fn create_merge_events( | |||
| 1110 | { | 1110 | { |
| 1111 | vec![*commit] | 1111 | vec![*commit] |
| 1112 | } else { | 1112 | } else { |
| 1113 | // child commits were added to merged_patches first so we reverse it | ||
| 1113 | let mut t: Vec<Sha1Hash> = merged_patches.keys().copied().collect(); | 1114 | let mut t: Vec<Sha1Hash> = merged_patches.keys().copied().collect(); |
| 1114 | t.reverse(); | 1115 | t.reverse(); |
| 1115 | t | 1116 | t |