search

samtools / htslib

C library for high-throughput sequencing data formats
Other
784 stars 447 forks source link

Drop duplicate FORMAT tags and fix an error with dropping large tags #1736

Closed pd3 closed 4 months ago

pd3 commented 5 months ago

The removal of large tags introduced by b49eea4 and 9db565de could not work correctly, the memmove pointers were wrong!

Resolves #1733

jkbonfield commented 4 months ago

What does "pd3 force-pushed the develop branch from 6fd3fde to dd9c561 26 minutes ago" mean? Normally we see merge commits (which are fast-forward only). (Given it's apparently correct, but I don't understand what actually changed. Just a hash difference due to meta-data or something?)

Eg "@vasudeva8 vasudeva8 merged commit a71551b into samtools:develop Jan 18, 2024 9 checks passed" from the last NEWS updates.

Unfortunately I just did a git pull and my develop didn't have 6fd3fde in it anyway, so I can't get a sensible network graph out to know what happened.

Generally however, we shouldn't be force pushing over the top of develop as it can cause breakage. Was 6fd3fde on the main line before this happened?

Was this an accidental push to samtools:develop instead of pd3:develop?

Edit: It doesn't look from from what I can see, but I just wasn't expecting this sudden closure of the PR and a force push, so I'm curious to know what happened.

pd3 commented 4 months ago

I sincerely hope the force push was on pd3:develop after it was forcefully synced with the main repo using

cd pd3.htslib
git fetch main-repo
git reset --hard main-repo/develop
git push origin develop --force

What happen is that this messed with the open pull request. Uh.

I still should have the pull request on a different computer. Hopefully I'll manage to put it back. Sorry about this.

The commits still exist in the git, there were just these two, I think https://github.com/pd3/htslib/commit/664a5da65e38e302eb4648fa6eeefef6dd46454c https://github.com/pd3/htslib/commit/6fd3fded559040e29dafb160c06c7089051c51ee

jkbonfield commented 4 months ago

No problem. It was just an ambiguous github message that doesn't adequately explain which repository it's talking about as both have "develop". I guess I just rarely see this message. Thanks for clarifying.