March 30th, 2022 | notes | kipras melnikovas

(hidden) PEZEpG0Mu #[[(hidden) S-ygYfi0j]]
- (hidden) Vmajvti7o [[(hidden) VV57ZaA7t]]
  - {{[[DONE]]}} (hidden) a4X6I_N_V [[(hidden) tv1zOVzED]]
  - {{[[DONE]]}} (hidden) _nB2ZaSj8
    - {{[[DONE]]}} (hidden) KxMJG3D-w
  - (hidden) FSk3OVl2s
    - {{[[DONE]]}} (hidden) yG0sgbH4e
  - {{[[DONE]]}} (hidden) GFzOgu6m4 [[(hidden) tv1zOVzED]]
    - {{[[TODO]]}} (hidden) G3w4n2lnj
  - {{[[TODO]]}} (hidden) aA-T91nny [[(hidden) qTwAPyDQY]]
    - {{[[DONE]]}} (hidden) ZXlR60zFu
    - {{[[TODO]]}} (hidden) IbwAwVtoW
  - {{[[TODO]]}} (hidden) BMrqYE4_6 [[(hidden) qTwAPyDQY]]
    - {{[[TODO]]}} (hidden) wi_QjL6Ua
    - {{[[TODO]]}} (hidden) iLs9FBdHe
  - {{[[TODO]]}} (hidden) CL_Rkf5Fi
  - (hidden) zLKbt3vlK [[(hidden) 03-31-2022]]
    - {{[[TODO]]}} (hidden) priJ8h3QQ [[(hidden) 03-30-2022]]
    - (hidden) yy5YLI67f
      - {{[[TODO]]}} (hidden) NWBBrq_cs
      - (hidden) _w-JOQjQK
        
        {{[[TODO]]}} (hidden) Bdqe4CSYA
      - (hidden) 3r3kH-Pqy
    - (hidden) mZoY-Y4uz
  - (hidden) apGQ_omch
- (hidden) BoaJuRacM
- (hidden) Wx0uKKuQg
- (hidden) sEbcouf2U
- {{[[TODO]]}} (hidden) 4ZH9IfLUl [[(hidden) INH9Q1Rs-]] #[[(hidden) Hdw5aSyar]] #read #[[(hidden) 2gtAB_GcO]]
  - (hidden) 9VJFPjg2s
- {{[[TODO]]}} (hidden) IRda60FmI [[(hidden) ItSd1pcxr]] #read
  - (hidden) dF_lZ7WkO
- {{[[DONE]]}} teach some [[git-rebase]] stuff to [[(hidden) JCn2rEoOE]]
  - hehe, classic mistake of `git pull` after rebase, instead of `git push --force[-with-leave]`
  - https://stackoverflow.com/questions/9264314/git-commits-are-duplicated-in-the-same-branch-after-doing-a-rebase
  - notes on how to introduce a newbie to `git rebase -i`: [[(hidden) G8LZoKG3P]]
    - ask if they have used vim & are comfortable working with it
      - if no, setup the editor as vscode:
        
        `~/.gitconfig`
        
```shell [core] editor = '/usr/local/bin/code' --wait #editor = '/usr/local/bin/code' --new-window --wait ```

if sending thru slack, put in backticks (``) to avoid slack changing the characters & them ending up broken
- optionally add another alias for `git log` for viewing a graph of commits
  - ```shell [alias] lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit ```
  
  if sending thru slack, put in backticks (``) to avoid slack changing the characters & them ending up broken
- now do the actual rebase
  - vscode will probably open the bloated custom editor. no need, get rid of it ("disable rebase editor" & re-launch the rebase if doesn't automatically switch to just raw `git-rebase-todo` text file editing)
(hidden) MkAOGH2ax
(hidden) 2bYSzpGjB
[[git-stacked-rebase]]
- re: [[git]] bindings, [[(hidden) qbhpV9DHv]]
- {{[[DONE]]}} #read https://stackoverflow.com/questions/4034962/which-language-has-the-best-git-api-bindings
  - {{[[TODO]]}} #read https://git.wiki.kernel.org/index.php/InterfacesFrontendsAndTools#JavaScript
    - heh, looks like [[(hidden) qbhpV9DHv]] is the best we can do (unless we fork git & implement the core functionality in [[(hidden) U5k5oJ6YK]] kek)
- #[[(hidden) S-ygYfi0j]]
  - re: why [[typescript]]
    - https://pipedrive.slack.com/archives/D02JTAHB9E2/p1648649641596839
    - > hehe, typescript because 1. it’s my main language by far, 2. i don’t code in go, 3. i need bindings to git. the libgit2 project provides them, the best version is of course in pure C, but the nodejs version is i think one of the best maintained ones on top of it if not the best, so just makes sense to use it, 4. in the future will need to use github/gitlab/etc APIs, so working w/ http is easy in ts, and both github & gitlab have api client libraries available mostly because of 1., but it all made sense as things went on:D
- {{[[DONE]]}} implement the "creating new latest branch by adding `branch-end-new` at the very end, and moving the `branch-end-latest` somewhere earlier before it"
  - {{[[DONE]]}} maybe `branch-end` would be enough? tho way more ambiguous for us, likely not, at least for now
  - {{[[DONE]]}} fix "CursorMoved[I]" when creating a newline at the end of file
    - turns out was just neovim & not having installed the npm package globally fault (partly because of nvm)
  - {{[[DONE]]}} fix the "multiple branches on the same commit"
    - {{[[DONE]]}} this could fix the duplicate remote branch showing up, if you have new commits in latest branch but haven't pushed yet
  - {{[[TODO]]}} might need to start encoding metadata in branches / commits, if we want to allow other people recover from someone else changing the latest branch (disaster in most cases; should only be used by yourself if you're switching laptops, otherwise very bad idea, we'd cover only very simple cases, but regardless)
- {{[[DONE]]}} adaptive branch boundary parser behavior for `--exec`
- {{[[DONE]]}} lol, disallow rebase if have unstaged changes
  - oh, actually cannot remove the `2>&1` piping of stderr, because we intentionally error out of the editor to get the git-rebase-todo file generated, but to avoid actually proceeding.
    - and i don't want to use the `break` hack here, because the rebase is not actually in progress yet - we only want to parse the commit boundaries.
      - this util can be used anywhere so further args against keeping in progress instead of cleaning up.
        
        {{[[DONE]]}} need explicit handling ourselves to disallow w/ unstaged changes
        
        {{[[DONE]]}} oooor, could write into a file in the script - right before exiting - to confirm success. and then, when we catch the error, we can check if successful or not, and then control both the stderr & the behavior
        
        {{[[TODO]]}} need to cleanup the output, but for now it's good
- {{[[TODO]]}} reduce the excessive logging in the native rebase implementation
- {{[[TODO]]}} oh no. `--autosquash` only works if we use native git rebase to generate the initial todo. that's fine. (also some improvements were needed to pass in the correct command when re-generating our own git-rebase-todo file when adding the branch commands, but was easy enough).
  - {{[[TODO]]}} what's not fine is that you're likely to have the latest commit to be autosquash-able, and in that case, because we don't handle the `--autosquash` ourselves, your latest branch also goes back into wherever you "fixed"-up into... rip newer commits
    - oh no will we need to re-implement literally everything from git's native rebase? i really don't want to lmao
      - how many things do i not know about btw?
      - you know how fragile would it be btw?
  - {{[[DONE]]}} forcibly disabled with `--no-autosquash` for now. i think we'll be able to fix this (added comment how), but currently not highest prio
- {{[[TODO]]}} parallel `--push` (thus w/o needing to checkout branches prolly)
(hidden) tlScabTVl
(hidden) ZOxuuGBQh
(hidden) puSWulT0R
(hidden) EawSplvRc
(hidden) 7PYh8DeSY

words:	1051 + 19 = 1070
last update: