2024 updates

Author: ricardobeat

git-co

@@ -0,0 +1,10 @@
+#/bin/bash
+
+STASH=$(git stash create)
+
+branch_list=$(git for-each-ref --sort=-committerdate --format='%(refname:short)' refs/heads/ | grep -v -e "^$")
+git checkout $(echo "$branch_list" | fzf --preview 'git show --color {}')
+
+if [[ -n $STASH ]]; then
+    git stash apply $STASH
+fi

git-list-autostash

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+# finds detached autostash commits
+git fsck --no-reflog \
+  | awk '/dangling commit/ {print $3}' \
+  | xargs -n1 git log --pretty='%h %s' -p -1

git-remaster

@@ -4,8 +4,8 @@
 #
 # git-remaster
 #
-#   Rebases the current branch and updates the main branch at the same time,
-#   preserving staged and unstaged changes in both.
+#   Updates the master branch without having to checkout, and then rebases the
+#   current feature branch on top of the latest commits in master
 #
 #     git checkout my-branch
 #     git remaster
@@ -17,33 +17,10 @@ set -e
 MAIN_BRANCH=$(git symbolic-ref refs/remotes/origin/HEAD --short | sed 's,origin/,,')
 BRANCH=$(git rev-parse --abbrev-ref HEAD)
 
-if [ -z $MAIN_BRANCH ]; then
-    echo "No master/trunk branch found."
-    exit 1
-fi
- 
-# save current state to a detached commit object and reset
-RSTASH=$(git stash create --include-untracked)
+echo "Updating $MAIN_BRANCH branch..."
+git pull origin $MAIN_BRANCH:$MAIN_BRANCH --rebase --autostash
 
-if [[ $RSTASH ]]; then
-    echo "Stashed $RSTASH"
-    git stash store -m "Remaster on branch $BRANCH $(date)" "$RSTASH"
-	git reset --hard
-fi
-    
-# fetch updates
-if git fetch --no-tags origin $MAIN_BRANCH; then
-    # if not on master branch, check it out, update and return to branch
-    if [[ $BRANCH != $MAIN_BRANCH ]]; then
-        git checkout $MAIN_BRANCH
-        git rebase origin/HEAD --rebase-merges --autostash
-        git checkout -
-    fi
-    # rebase changes on top of origin/master
-    git rebase origin/$MAIN_BRANCH --rebase-merges
-fi
- 
-# bring back stash if available, hide errors when empty
-if test $RSTASH; then
-    git stash apply $RSTASH
-fi
+if [[ $BRANCH == $MAIN_BRANCH ]]; then exit 0; fi
+
+echo "Rebasing $BRANCH on top of master..."
+git rebase origin/$MAIN_BRANCH --rebase-merges --autostash

git-remaster.md

@@ -0,0 +1,9 @@
+This doesn't work, git pull fails because of ff-only config in .gitconfig
+
+    git pull origin $MAIN_BRANCH:$MAIN_BRANCH --rebase --autostash
+    git rebase origin/$MAIN_BRANCH --rebase-merges --autostash
+
+can't use `git rebase` directly from origin
+can't use `git fetch branch:branch` as it doesn't take rebase arg
+
+so the only solution is to stash manually before, as the script does.

git-review

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+TARGET=${1:-diff}
+
+preview () {
+    fzf --preview 'bat --color=always --style=header,grid,changes --line-range :500 {2}'
+}
+
+
+usage () {
+    echo "
+Usage:
+  git review
+  git review [hash]
+"
+}
+
+if [[ $TARGET = "diff" ]]; then
+    git status -s | preview
+elif [[ -n $TARGET ]]; then
+    if git show-ref -q $TARGET; then
+        git diff --name-only $TARGET | preview
+    else
+        usage
+        exit 1
+    fi
+fi