Comment by forrestthewoods

Comment by forrestthewoods 6 days ago

14 replies

View on Hacker News

> why I maintain the discipline that all commits to the "real" branch, however you define that term, should all individually build and pass all (known-at-the-time) tests and generally be deployable in the sense that they would "work" to the best of your knowledge, even if you do not actually want to deploy that literal release

You’re spot on.

However it’s clearly a missing feature that Git/Mercurial can’t tag diffs as “passes” or “bisectsble”.

This is especially annoying when you want to merge a stack of commits and the top passes all tests but the middle does not. It’s a monumental and valueless waste of time to fix the middle of the stack. But it’s required if you want to maintain bisectability.

It’s very annoying and wasteful. :(

michalsustr 6 days ago

This is why we use squash like here https://docs.gitlab.com/ee/user/project/merge_requests/squas...

Reply View 10 replies
  • snowfarthing 6 days ago

    As someone who doesn't like to see history lost via "rebase" and "squashing" branches, I have had to think through some of these things, since my personal preferences are often trampled on by company policy.

    I have only been in one place where "rebase" is used regularly, and now that I'm a little more familiar with it, I don't mind using it to bring in changes from a parent branch into a working branch, if the working branch hasn't been pushed to origin. It still weirds me out somewhat, and I don't see why a simple merge can't just be the preferred way.-

    I have, however, seen "squashing" regularly (and my current position uses it as well as rebasing) -- and I don't particularly like it, because sometimes I put in notes and trials that get "lost" as the task progresses, but nonetheless might be helpful for future work. While it's often standard to delete "squashed" branches, I cannot help but think that, for history-minded folks like me, a good compromise would be to "squash and keep" -- so that the individual commits don't pollute the parent branch, while the details are kept around for anyone needing to review them.

    Having said that, I've never been in a position where I felt like I need to "forcibly" push for my preferences. I just figure I might as well just "go with the flow", even if a tiny bit of me dies every time I squash or rebase something, or delete a branch upon merging!

    Reply View 3 replies
    • Izkata 5 days ago

      > I cannot help but think that, for history-minded folks like me, a good compromise would be to "squash and keep" -- so that the individual commits don't pollute the parent branch, while the details are kept around for anyone needing to review them.

      But not linked together and those "closed" branches are mixed in with the current ones.

      Instead, try out "git merge --no-ff" to merge back into master (forcing a merge commit to exist even if a fast-forward was possible) and "git log --first-parent" to only look at those merge commits. Kinda squash-like, but with all the commits still there.

      Reply View 0 replies
    • rlkf 5 days ago

      I use git-format-patch to create a list of diffs for the individual commits before the branch gets squashed, and tuck them away in a private directory. Several times have I gone back to peek at those lists to understand my own thoughts later.

      Reply View 0 replies
    • r-bryan 5 days ago

      Well dang, we are not restricted to git as the only place we can put historical metadata. You know, discursive comments, for starters?

      Reply View 0 replies
  • forrestthewoods 6 days ago

    I explicitly don’t want squash. The commits are still worth keeping separate. There’s lots of distinct pieces of work. But sometimes you break something and fix it later. Or you add something new but support different environments/platforms later.

    Reply View 4 replies
    • gregthelaw 5 days ago

      But if you don't squash, doesn't this render git bisect almost useless?

      I think every commit that gets merged to main should be an atomic believed-to-work thing. Not only does this make bisect way more effective, but it's a much better narrative for others to read. You should write code to be as readable by others as possible, and your git history likewise.

      Reply View 3 replies
      • Izkata 5 days ago

        Individual atomic working commits don't necessarily make a full feature. Most of the time I build features up in stages and each commit works on its own, even without completing the feature in question.

        Reply View 0 replies
      • forrestthewoods 5 days ago

        You should read my original comment.

        git bisect should operate on bisectable commits. Which may not be all commits. Git is missing information. This is, imho, a flaw in Git.

        Reply View 0 replies
  • badmintonbaseba 5 days ago

    git bisect supports --first-parent, no need to squash if you just merge.

    Reply View 0 replies
Izkata 6 days ago

If there's a way to identify those incomplete commits, git bisect does support "skip" - a commit that's neither good nor bad, just ignored.

Reply View 1 reply
  • JetSetIlly 5 days ago

    Can we use git trailers for this? Something like "commit: incomplete" in the commit message.

    Reply View 0 replies
rlkf 5 days ago

Could you not use --first-parent option to test only at the merge-points?

Reply View 0 replies