Re: [git pull] drm-next
www.mail-archive.com

I want clean history, but that really means (a) clean and (b) history.

People can (and probably should) rebase their private trees (their own work). That’s a cleanup. But never other peoples code. That’s a “destroy history”

So the history part is fairly easy. There’s only one major rule, and one minor clarification:

  • You must never EVER destroy other peoples history. You must not rebase commits other people did.

[…]

If you are working with git together with other people, it’s worth a read.

  • magic_lobster_party@fedia.io
    0·
    10 days ago

    I think this is dependent on context. Linus is working with a very public repository. Private repositories shared with a small team have different conditions.

    What works in my smallish team at my company is:

    • Enable squash commits. Each PR should be squashed to a single commit. This makes the master branch linear and simple. This ensures each individual commit on master has been reviewed and is in a working state.
    • You can do whatever shit you want on your own branch. It’s going to be squashed anyway.
    • Don’t base your work on some other team member’s branch, unless agreed upon. That’s their work. You should only depend on the master branch.
    • Never rewrite what has already been committed to the master branch.
    • wccrawford@discuss.online
      0·
      10 days ago

      That sounds like pretty much exactly what we did at my last job, and it worked pretty well IMO. The individual commits in a PR didn’t ever matter. I don’t even think we used them for code review, except if it came up for review a second time after rework. In that case, we were able to just look at the new commit to see if the right changes were made.

      And we definitely avoided basing off each other’s branches. We had to do it a few times. The only times it went well was when the intent was to merge the child branch into the feature branch. If they were actually separate tickets (and the second relied on the first) it was generally chaotic. But sometimes, it was just necessary.

    • fitgse@sh.itjust.works
      0·
      10 days ago

      If ‘—first-parent’ was the default way that git log worked, I don’t think we’d even be having this argument over how to merge branches.

      In my opinion, the best strategy is to always use a merge commit, and then when viewing master, always use —first-parent which will ONLY show commits on master. This gives you:

      • a very clean, linear history
      • the ability to let people work in their branches in their own way (it is ok to merge master into your branch multiple times without rebasing)
      • you can dig into the history of any branch if needed
      • it makes it easy to backport changes as you can cherry-pick out the merge commit which contains everything.

      The problem is just the default log view of git and tools.

    • Kissaki@programming.devEnglish
      0·
      10 days ago

      Enable squash commits. Each PR should be squashed to a single commit. This makes the master branch linear and simple. This ensures each individual commit on master has been reviewed and is in a working state.

      In non-minimal changesets, I would miss information/documentation about individual logical changes that make up the changeset. Commit separation that is useful for review will also be useful for history.

      I prefer a deliberate, rebase- and rewrite-heavy workflow with a semi-linear history. The linear history remains readable, while allowing sum-of-parts changesets/merges.

      It’s an investment, but I think it guides into good structuring and thoughts, and whenever you look at history, you have more than a squashed potential mess.

      Squash-on-merge is simpler to implement and justify, of course. Certainly much better than “never rebase, never rewrite, always merge”, which I am baffled some teams have no problem doing. The history tree quickly becomes unreadable.

      • GissaMittJobb@lemmy.ml
        0·
        10 days ago

        In non-minimal changesets, I would miss information/documentation about individual logical changes that make up the changeset.

        It’s usually possible to find this by navigating back to the PR which you can find referenced in the squash commit.

        I guess this might be a larger problem for codebases not following a trunk-based approach, where PRs grows to very large sizes before going into the mainline branch.

      • magic_lobster_party@fedia.io
        0·
        10 days ago

        What I like with squash on merge is I don’t need to worry about shit my coworkers make. My coworkers can have terrible git disciplines, and the master branch is still clean.

        • killeronthecorner@lemmy.worldEnglish
          0·
          10 days ago

          This is the reality. You’ll spend most of your time working with people of varying SCM skill levels, and spread all the way across the spectrum. Squash commits combined with centralised auditing (GHE, GitLab, etc) add the necessary rail to keep a clean history on main and to make building-block change sets easily revert-able.

          In my decades working on large teams of engineers, the need to identify changes by wip/interim commits has never been terribly useful for the reason you describe: everyone has different git hygiene procedures and most corps don’t give a tiny little shit about maintaining that level of hygiene unless you’re white room / highly regulated.

          And if you do want that level of depth you can go find the PR/MR in the central source where the revision history of the dead branch is often sustained (unless you configure it not to)

          But yeah, I call YAGNI a lot on git history purists to this day. It’s a huge amount of effort and coordination to retain a tiny amount of value that is 50/50 gonna be useful depending on the git hygiene of the person who wrote it. Save your efforts and just read the damn code.