Weird commit history branching

[Greg Ercolano]

Just noticed this weird "indent" in the commit history. Thought maybe I had a problem locally, but this seems like it's actually in master.

Seems like there's a split in the commit history as of a few days ago with a "Merge pull request #17", causing the commit history to indent for 3 years worth of commits going back as far as Nov 14 2021.

Maybe this is business as usual, it just seemed odd:

[Greg Ercolano]

I find if I checkout fe7560fe6, which is the last commit from Aug 9 2024, just before that weird "parallelogram knuckle" in the commit history occurs, then commit history goes back to normal, e.g.

    git checkout fe7560fe6
    gitk                           <-- shows a normal commit history

Like I said, not sure if that's a problem or not, but if it is, seems like it might not be too late to fix it; there's only been ~10 commits since that merge.

--
You received this message because you are subscribed to the Google Groups "fltk.coredev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to fltkcoredev...@googlegroups.com.
To view this discussion on the web visit https://groups.google.com/d/msgid/fltkcoredev/e00ba4fa-4d5d-4de2-8b34-212c0cbd553f%40seriss.com.

-- 
Greg Ercolano, er...@seriss.com
Seriss Corporation
Tel: +1 626-576-0010 ext.8
Cel: +1 310-266-8906
Skype: ercolano77

      Rush Render Queue: http://seriss.com/rush/
  1A2 KSU Phone Systems: http://seriss.com/1a2-ksu/
Optical Printer Control: http://seriss.com/opcs/

[Albrecht Schlosser]

On 8/13/24 02:54 Greg Ercolano wrote:

Just noticed this weird "indent" in the commit history. Thought maybe I had a problem locally, but this seems like it's actually in master.

Seems like there's a split in the commit history as of a few days ago with a "Merge pull request #17", causing the commit history to indent for 3 years worth of commits going back as far as Nov 14 2021.

Maybe this is business as usual, it just seemed odd: ...

Don't worry, this "indenting" in gitk is normal, and the fact that it's going back for such a long time is obviously caused by the fact that we avoid merge commits as far as possible. But this is only cosmetics in gitk, no problem in our FLTK git repo.

FYI, the effects of my recent merge commit were (semi-)intended. I wanted to merge the PR but not squash it because I had fixed more code (in fltk-options/Makefile in a separate commit) than we had in the OP's PR (fltk-options was added later than the PR was started). In this case a "real merge" makes sense because it shows that the two merged commits are related.

Unintended by me was only that I had missed Matt's commit 02a208b92 that was pushed while I was working on the merge.

In your follow-up mail you wrote:

> seems like it might not be too late to fix it; there's only been ~10 commits since that merge.

Nope, never "fix" commits that have been pushed to public. Never.