Add git-rebase-all

PythonCoderAS · PythonCoderAS · commit 87fce311b99f · 2021-12-12T12:21:10.000-05:00
diff --git a/README.md b/README.md
@@ -23,4 +23,10 @@ This script was intended to quickly deploy changes to heroku when using the git
 ## git-full-restore
 
 Small script to quickly remove all changes from a file and restore it to the last commit. This includes if the files are
-staged or not.
+staged or not.
+
+## git-rebase-all
+
+Script that will pull in the latest copy of `origin/master`, and then rebase all other local branches around
+origin/master. It will abort a rebase if it encounters merge conflicts. This is very useful to rebase all branches upon
+a merge occuring to the origin/master branch.
diff --git a/bin/git-rebase-all b/bin/git-rebase-all
@@ -4,64 +4,67 @@ TMPDIR=$(mktemp -d -t "git-rebase-all")
 log="branchdata.log"
 
 progress() {
-    local w=120 p=$1;  shift
-    # create a string of spaces, then change them to dots
-    printf -v dots "%*s" "$(( $p*$w/100 ))" ""; dots=${dots// /.};
-    # print those dots on a fixed-width space plus the percentage etc. 
-    printf "\r\e[K|%-*s| %3d %% %s" "$w" "$dots" "$p" "$*"; 
+  local w=120 p=$1
+  shift
+  # create a string of spaces, then change them to dots
+  printf -v dots "%*s" "$((p * w / 100))" ""
+  dots=${dots// /.}
+  # print those dots on a fixed-width space plus the percentage etc.
+  printf "\r\e[K|%-*s| %3d %% %s" "$w" "$dots" "$p" "$*"
 }
 
-
 on_fail() {
-	local branch="$1"
-	local branch_log="$TMPDIR/branch-$branch.log"
-	echo "Failed to rebase $branch" >> "$TMPDIR/$log"
-	git rebase --abort >> "$branch_log" 2>&1
+  local branch="$1"
+  local branch_log="$TMPDIR/branch-$branch.log"
+  echo "Failed to rebase $branch" >>"$TMPDIR/$log"
+  git rebase --abort >>"$branch_log" 2>&1
 }
 
 on_success() {
-	local branch="$1"
-	local branch_log="$TMPDIR/branch-$branch.log"
-	echo "Successfully rebased branch $branch" >> "$TMPDIR/$log"
-	git push --force >> "$branch_log" 2>&1
+  local branch="$1"
+  local branch_log="$TMPDIR/branch-$branch.log"
+  echo "Successfully rebased branch $branch" >>"$TMPDIR/$log"
+  git push --force >>"$branch_log" 2>&1
 }
 
 update_counter() {
-    counter="$(( $counter+${1:-1} ))"
-	progress $(( ($counter*100)/${branch_count:-$counter} ))
+  counter="$((counter + 1))"
+  progress $((counter * 100 / ${branch_count:-$counter}))
 }
 
 {
-    branches="$(git branch | sed "s/\*//g" | sed "s/ //g")"
-    branch_count="$(echo ${branches} | wc -w| tr -d '\040\011\012\015')"
+  branches="$(git branch | sed "s/\*//g" | sed "s/ //g")"
+  branch_count="$(echo "${branches}" | wc -w | tr -d '\040\011\012\015')"
 }
 
-git cleanbranches
+git checkout master
+git pull
 
-for branch in ${branches};
-do {
+for branch in ${branches}; do
+  {
     branch_log="$TMPDIR/branch-$branch.log"
-	echo Processing branch ${branch} >> ${branch_log} 2>&1
-    git checkout ${branch} >> ${branch_log} 2>&1
-    if git rebase upstream/master >> ${branch_log} 2>&1
-    then {
-        on_success ${branch}
-    }
-    else {
-        on_fail ${branch}
-    }
+    echo Processing branch "${branch}" >>"${branch_log}" 2>&1
+    git checkout "${branch}" >>"${branch_log}" 2>&1
+    if git rebase origin/master >>"${branch_log}" 2>&1; then
+      {
+        on_success "${branch}"
+      }
+    else
+      {
+        on_fail "${branch}"
+      }
     fi
     update_counter
-}
+  }
 done
 
-git checkout master >> /dev/null 2>& 1
+git checkout master >>/dev/null 2>&1
 {
-    echo
-    echo "Printing log"
-    cat "$TMPDIR/$log"
-    echo
-    echo "View rest of logs at $TMPDIR"
-    ls -FGl $TMPDIR
+  echo
+  echo "Printing log"
+  cat "$TMPDIR/$log"
+  echo
+  echo "View rest of logs at $TMPDIR"
+  ls -FGl "$TMPDIR"
 }
 exit 0
