Second article on Stacked Git

5 files changed, 132 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index bb5896c..b4e5b7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@ logs/site--news--November2022.html.stderr
 logs/site--news--September2022.html.stderr
 logs/site--opinions--index.html.stderr
 logs/site--opinions--MonadTransformers.html.stderr
+logs/site--opinions--StackedGit2.html.stderr
 logs/site--opinions--StackedGit.html.stderr
 logs/site--posts--cleopatra--commands.html.stderr
 logs/site--posts--cleopatra--coq.html.stderr
@@ -57,6 +58,7 @@ logs/site--news--November2022.html.stdout
 logs/site--news--September2022.html.stdout
 logs/site--opinions--index.html.stdout
 logs/site--opinions--MonadTransformers.html.stdout
+logs/site--opinions--StackedGit2.html.stdout
 logs/site--opinions--StackedGit.html.stdout
 logs/site--posts--cleopatra--commands.html.stdout
 logs/site--posts--cleopatra--coq.html.stdout
@@ -98,6 +100,7 @@ site/news/November2022.html
 site/news/September2022.html
 site/opinions/MonadTransformers.html
 site/opinions/StackedGit.html
+site/opinions/StackedGit2.html
 site/opinions/index.html
 site/posts/.AlgebraicDatatypes.aux
 site/posts/.ClightIntroduction.aux
diff --git a/site/index.org b/site/index.org
index 640b8b1..c10d0c6 100644
--- a/site/index.org
+++ b/site/index.org
@@ -9,12 +9,12 @@ let me know!].
   All categories combined, here is the last pieces of contents I have
   published on this website.
 
+  - [[./opinions/StackedGit2.org][How I Keep Using Stacked Git at ~$WORK~ in 2023]] /(January 15, 2023)/
   - [[./news/November2022.org][Monthly Retrospective: October and November 2022]] /(November 19, 2022)/
   - [[./news/September2022.org][Monthly Retrospective: September 2022]] /(September 18, 2022)/
   - [[./news/August2022.org][Monthly Retrospective: August 2022]] /(August 15, 2022)/
   - [[./posts/RankNTypesInOCaml.org][Writing a Function Whose Argument is a Polymorphic Function in
     OCaml]] /(August 7, 2022)/
-  - [[./opinions/StackedGit.org][How I Use Stacked Git at ~$WORK~]] /(January 15, 2022)/
 
   I had an RSS feed once, but it’s long gone, mostly because the
   toolchain I ended up writing for generating this website does not
diff --git a/site/opinions/StackedGit.org b/site/opinions/StackedGit.org
index dfb537f..a53fd98 100644
--- a/site/opinions/StackedGit.org
+++ b/site/opinions/StackedGit.org
@@ -2,6 +2,7 @@
 
 #+SERIES: index.html
 #+SERIES_PREV: MonadTransformers.html
+#+SERIES_NEXT: StackedGit2.html
 
 According to [[https://lobste.rs/s/s6quvg/stacked_git][my Lobste.rs history]], I have run into [[https://stacked-git.github.io][Stacked Git]] in
 early April, 2021, and I remember its promises hit a soft spot.
diff --git a/site/opinions/StackedGit2.org b/site/opinions/StackedGit2.org
new file mode 100644
index 0000000..a4a2e3b
--- /dev/null
+++ b/site/opinions/StackedGit2.org
@@ -0,0 +1,121 @@
+#+SERIES: index.html
+#+SERIES_PREV: StackedGit.html
+
+#+TITLE: How I Keep Using Stacked Git at ~$WORK~
+
+One year ago, I have published an article summarizing
+[[./StackedGit.html][my experience using Stacked Git at ~$WORK~]]. Twelve months later,
+enough has changed to motivate a spin-off piece.
+
+* Stacked Git is /Fast/
+  Firstly, it is important to state that my main complain is now a
+  thing of the past! In particular, Stacked Git does not feel slow
+  anymore, and far from it. This is because
+  [[https://github.com/stacked-git/stgit/discussions/185][Stacked Git 2.0 has been rewritten in Rust]]. RiiR (/Rewrite it in
+  Rust/) is a running meme on the Internet, but in this particular
+  case, the result is very exciting.
+
+  Thanks to the performance boost, my Zsh prompt does not take 0.1s to
+  appear.
+
+  Speaking of Zsh prompt, basically what I ended up displaying is
+  ~(<TOP PATCH NAME> <APPLIED PATCHES COUNT>/<PATCHSET SIZE> <HIDDEN
+  PATCHES COUNT)~. For instance, ~(fix-1337 1/2 3)~.
+
+  In case you want to take inspiration in my somewhat working
+  configuration, here is the snippet of interest.
+
+  #+begin_src sh
+local series_top="$(stg top 2> /dev/null)"
+local total="$(stg series 2> /dev/null | wc -l)"
+local hidden="$(stg series --hidden 2> /dev/null | wc -l)"
+
+if [[ "${total}" -gt 0 ]]; then
+    local not_applied="$(stg series | grep -E '^-' | wc -l)"
+    local applied="$(($total - $not_applied))"
+
+    if [[ -z "${series_top}" ]]; then
+        series_top="·"
+    fi
+
+    echo -n "(${status_color}${series_top} ${applied}/${total} ${hidden})"
+    echo -n "  ($(current_branch))"
+fi
+  #+end_src
+
+* Branchless Workflow
+  Last year, I was using Stacked Git on top of git branches. More
+  precisely, I had one branch for each (stack of) Merge Request. It
+  worked well, because my typical MR counted 3 to 4 commits in
+  average.
+
+  [[mn:onecommit][This approach comes with its set of drawbacks too,
+  it goes without saying. During the past year, I’ve pushed fairly
+  large commits which could have been splitted into several smaller
+  ones. I have also had to manage large stacks of MRs.]]
+
+  Fast forward today, and things have changed on this front too. In a
+  nutshell, I have become a “one commit per MR” maximalist of sort. I
+  find this approach very effective to get more focused reviews, and
+  to reduce the time it takes for a given MR to be integrated into the
+  main branch. My previous approach did not scale well with this new
+  mindset, and during the course of the year, I stopped using branches
+  altogether.
+
+  I did not invent the branchless workflow, of course.
+  After it was first published, someone posted a link to my Stacked
+  Git article on Hacker News, and
+  [[https://news.ycombinator.com/item?id=29959224][*@arxanas* posted a comment about ~git-branchless~]]. I tried the
+  tool, and even if it never clicked for me, I was really compelled by
+  its core ideas. Similarly,
+  [[https://drewdevault.com/2020/04/06/My-weird-branchless-git-workflow.html][Drew DeVault has published a complete article on its own branchless
+  workflow in 2020]].
+
+  In my case, I proceeds as follows.
+
+  1. I name each patch after the branch to which I will push it on our
+     upstream Git remote.
+  3. I created a small git plugin I called ~git-prepare~ which allows
+     me to select one of the patch of my current patchset using ~fzf~,
+     and which pops all other patches that are currently applied.
+  2. 99% of the time, I push my work using ~git push -f upstream @:$(stg top)~
+
+  ~git-prepare~ is really straightforward:
+
+  #+begin_src sh
+#!/bin/sh
+patch=$(stg series -P | fzf)
+
+if [[ ! $? -eq 0 ]] ; then
+    exit $?
+fi
+
+if [ -n "$(stg series -A)" ]; then
+    stg pop -a
+fi
+
+stg push ${patch}
+  #+end_src
+
+  The main hurdle which I still need to figure out is how to deal with
+  stacked MRs. Currently, this is very manual. I need to remember
+  which commit belongs to the stack, the order and dependencies of
+  these commits, and I need to publish each commit individually using
+  ~stg push; git push @:$(stg top)~.
+
+  The pragmatic answer is definitely to come back to git branches for
+  this use case in particular, but it's not the /fun/ answer. So from
+  time to time, I try to experiment new approaches. My current
+  intuition is that, by adopting a naming convention for my patches, I
+  could probably implement a thin tooling on top of Stacked Git to
+  deal with dependents commits.
+
+* Conclusion
+
+  Putting aside stacked MRs for now, I am really satisfied with my
+  workflow. It’s very lightweight and intuitive, and working without
+  Stacked Git now feels backward and clunky.
+
+  So I will take this opportunity to thank one more time Stacked Git’s
+  authors and contributors. You all are making my professional like
+  easier with your project.
diff --git a/site/opinions/index.org b/site/opinions/index.org
index 0fb281a..949460c 100644
--- a/site/opinions/index.org
+++ b/site/opinions/index.org
@@ -7,6 +7,12 @@ separate indexes.
 
 I would encourage you to use your critical mind while reading these write-ups.
 
+** 2023
+
+   - [[./StackedGit2.org][How I Keep Using Stacked Git at ~$WORK~ in 2023]] ::
+     One year has passed, and I keep using Stacked Git almost
+     daily. /How/ I am using it has slightly changed, though.
+
 ** 2022
 
    - [[./StackedGit.org][How I Use Stacked Git at ~$WORK~]] ::