Introduction - Steve's Jujutsu Tutorial
steveklabnik.github.io
  • atzanteol@sh.itjust.worksEnglish
    4·
    13 hours ago

    Hrm… It looks interesting but it seems too dedicated to crafting “the perfect commit”.

    Changing our description changed the commit ID! This is why we have both IDs: the change ID has not changed, but the commit ID has. This allows us to evolve our commit over time, but still have a stable way to refer to all versions of it.

    I don’t want to “evolve a commit” - I want to capture my changes over time. If I decide later that I want to prepare the commit for merging I will.

    I hate it because it’s different - but even trying to give it a “benefit of the doubt” I really can’t see this as better. It’s not like it’s difficult to create a “tidy” commit with git as is.

    And as far as “easier to use goes”… well… Here’s how you get a list of anonymous branches

    jj log -r 'heads(all())'

    And since they eschew branches with names you get to memorize hash strings instead of branch names that describe the thing you were doing?

    jj new pzoqtwuv yykpmnuq -m "merge better documentation"
# vs. 
git merge my_branch_Name

    I’m unconvinced. Though jj undo looks neat (and also crazy dangerous unless you can undo an undo?).

    • HaraldvonBlauzahn@feddit.orgOP
      1·
      12 hours ago

      And since they eschew branches with names you get to memorize hash strings instead of branch names that describe the thing you were doing?

      No trouble, you can still name branches if you want. And no, you don’t have to type the whole changeset hash, the first one to three letters are usually sufficient.

      Also, branch names are not a permanent thing, they disappear after you merged them.

      If you want, to can put an empty commit with the description of what you want to do at the top of your changes, and then use “jj split” to move changes to different commits before it. There are several common work flows which are explained in Klabnik’s blog post.

    • HaraldvonBlauzahn@feddit.orgOP
      11·
      12 hours ago

      Yeah you can undo undo and also resurrect undone states.

      If the readability of the commit history really does not matter to you - for exsmple, nobody needs to read this code again - it’s possible that jj does not give you enough advantage. Everyone works different.

      • atzanteol@sh.itjust.worksEnglish
        2·
        8 hours ago

        If the readability of the commit history really does not matter to you - for exsmple, nobody needs to read this code again - it’s possible that jj does not give you enough advantage. Everyone works different.

        I mean… It does and I will use git to manage commit histories as necessary. I don’t see jj as solving that problem or even making it easier. Doing a single squash-commit or a rebase -i when I merge a branch is relatively trivial.

        And from what I can tell it’s much easier to do a git pull upstream master than to do jj new skdfsld dskfjas since you’ll likely have to lookup those hashes? I mean I wouldn’t remember them.

        • HaraldvonBlauzahn@feddit.orgOP
          1·
          7 hours ago

          And from what I can tell it’s much easier to do a git pull upstream master than to do jj new skdfsld dskfjas since you’ll likely have to lookup those hashes? I mean I wouldn’t remember them.

          One takes them from the last commit log and uses the first few letters. Steve Klabnik shows how they are used in practice. It makes no sense to repeat it here.

          • atzanteol@sh.itjust.worksEnglish
            2·
            7 hours ago

            One takes them from the last commit log and uses the first few letters

            So - it’s not the length of the random garbage that is the issue it’s the fact that it’s random garbage that I have no chance of remembering after 5 seconds and switching between branches. All my branches are instead random hashes that I’ll need to lookup or remember.

            I’ve read through the blog. It sounds like they’ve taken the minor inconvenience of doing a git merge --squash and distributed that pain across every-single-commit you’re ever going to make instead. All to get “tidy commits” which were possible before anyway.

            I was actually rather interested in the idea of jj being something that made history-rewriting easier (e.g. for removing bad commits with passwords and the like). But the fact that it almost completely throws out the entire concept of working on named branches (yes you can have them - but “One interesting thing about branches in jj that’s different than branches in git is that branches do not automatically move.” - genius) is just ridiculous. And to claim that it’s now simpler just seems like gaslighting.