From 28ad5440c7184de9833f8448bc90153ee4499c83 Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Fri, 27 Feb 2026 15:40:24 +0000 Subject: fix: annotated tags missing from list due to dropped peeled refs RepoState::try_from was explicitly discarding all refs/tags/*^{} entries ("peeled" refs) when parsing the nostr state event. This meant the list command only advertised the tag object OID, but git requires two lines for annotated tags: refs/tags/v1.0.0 refs/tags/v1.0.0^{} Without the ^{} peeled line git cannot resolve the tag to a commit, so git fetch --prune treats it as unresolvable and deletes it. The nostr state event already stores both entries correctly (written by generate_updated_state in push.rs). The fix simply stops try_from from discarding the ^{} entries on read, so they flow through to the list output unchanged. --- src/bin/git_remote_nostr/push.rs | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'src/bin/git_remote_nostr/push.rs') diff --git a/src/bin/git_remote_nostr/push.rs b/src/bin/git_remote_nostr/push.rs index 870f22d..ed0f7df 100644 --- a/src/bin/git_remote_nostr/push.rs +++ b/src/bin/git_remote_nostr/push.rs @@ -925,6 +925,37 @@ fn generate_updated_state( ) -> Result> { let mut new_state = existing_state.clone(); + // Backfill missing ^{} peeled refs for any annotated tags already in the + // state. State events published before this fix only stored the tag object + // OID; without the corresponding ^{} entry git cannot resolve the tag to a + // commit and treats it as missing (git fetch --prune deletes it). We fix + // this opportunistically on every push so affected repos self-heal without + // requiring manual intervention. + let tag_refs: Vec<(String, String)> = new_state + .iter() + .filter(|(k, _)| k.starts_with("refs/tags/") && !k.ends_with("^{}")) + .map(|(k, v)| (k.clone(), v.clone())) + .collect(); + for (ref_name, tag_oid) in tag_refs { + let peeled_key = format!("{ref_name}^{{}}"); + if new_state.contains_key(&peeled_key) { + continue; + } + // check if the stored OID is a tag object (annotated tag) + if let Ok(oid) = git2::Oid::from_str(&tag_oid) { + if git_repo + .git_repo + .find_object(oid, Some(git2::ObjectType::Tag)) + .is_ok() + { + // peel to the commit the annotated tag points to + if let Ok(commit_oid) = git_repo.get_commit_or_tip_of_reference(&ref_name) { + new_state.insert(peeled_key, commit_oid.to_string()); + } + } + } + } + for refspec in refspecs { let (from, to) = refspec_to_from_to(refspec)?; if from.is_empty() { -- cgit v1.2.3