[wrong][spam][bugs] git behaviors
K. Slow trog. Right now I have a git repository checked out with a worktree open to a remote branch. The worktree head is a week out of date. The branch has been updated upstream, but when I type `git pull` it doesn't merge anything new. I'll try to make a terminal log. ... It's now 8:37a (-0400). Started this email at 7:12a . I'm having trouble directing my behavior. https://asciinema.org/a/C1jPRlmN5Nl582EaTPTk5s8sW
v1.9.0 is actually after v1.10.0 on my system. I assume the maintainers did something different from what I'm otherwise assuming. The releases branch showed v1.10.0 as Jun 23, and v1.9.0 as Jun 28. I then git log'd the v1.9.0 tag. Its commit was ada7f97 on May 17. It's after the v1.9.0 branch of the same name, which has 3ac3396 as its tip, earlier the same day. The commit message on the tag shows the tag was made on the `releases` branch I'm trying to sort out. BTW you can kinda mitm-verify my asciicast. Add ".cast" to the asciinema file to download it and: { cat file.cast | b2sum; cat file.cast | sha256sum; } | b2sum --length 32 93f28c48 Dunno if it verifies, I'm full of errors.
I'm mistaking v0.* and v1.* . I've likely made other errors. tag v0.9.0 commit 8f35a5c0 2020-10-07 tag v0.10.0 commit a6b2180 2020-10-12 branch v1.9.0 commit 3ac3396 2021-05-17 tag v1.9.0 commit ada7f97b 2021-05-17 tag v1.10.0 commit 764fa9dae6 2021-06-23 origin/releases I found it. I have a local branch locally named v1.9.0 that contains commits on top of v1.10.0 . I apparently merged something on top of my releases worktree and named it as an earlier version. I try (some disappear) to take 24/7 terminal logs, so that may be reviewable if needed.
Just to note, I have a common error why I replace parts of commands with other commands, so it makes sense I would cause a further error like that. Scary. So nice to learn what it likely was. My convulsions are worse from resisting the inhibition against investigating things. Happens a lot.
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 hello Karl, replies below as usual :) ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐ On Saturday, July 3rd, 2021 at 6:12 AM, Karl <gmkarl@gmail.com> wrote:
tag v0.9.0 commit 8f35a5c0 2020-10-07 tag v0.10.0 commit a6b2180 2020-10-12 branch v1.9.0 commit 3ac3396 2021-05-17 tag v1.9.0 commit ada7f97b 2021-05-17 tag v1.10.0 commit 764fa9dae6 2021-06-23 origin/releases ...
I found it. I have a local branch locally named v1.9.0 that contains commits on top of v1.10.0 .
I apparently merged something on top of my releases worktree and named it as an earlier version.
I try (some disappear) to take 24/7 terminal logs, so that may be reviewable if needed.
you can try increasing history size: in .bashrc, or .profile, or equiv, export HISTSIZE=500000 export HISTFILESIZE=10000000 note that if you use screen or tmux you'll want to compensate accordingly. regarding git confusion: i've also found visual git tools helpful tracking down merge and history issues. e.g. kdiff3, gitk or whatnot. in a tree view, you can see an odd merge or tag like you discuss above. best regards, -----BEGIN PGP SIGNATURE----- iNUEAREKAH0WIQRBwSuMMH1+IZiqV4FlqEfnwrk4DAUCYOYf1V8UgAAAAAAuAChp c3N1ZXItZnByQG5vdGF0aW9ucy5vcGVucGdwLmZpZnRoaG9yc2VtYW4ubmV0NDFD MTJCOEMzMDdEN0UyMTk4QUE1NzgxNjVBODQ3RTdDMkI5MzgwQwAKCRBlqEfnwrk4 DE+WAQCYfbn8zH0GXcOMy4vm07o2qVesOSL+RcYBuv767PCYFwD9G2JCeuQsboDz E/D2XkTzv3mg1l27+mkclPMp3lW8B3M= =fFzA -----END PGP SIGNATURE-----
participants (2)
-
coderman -
Karl