Skip to content

Instantly share code, notes, and snippets.

@paranoiq
Last active January 19, 2024 12:55
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save paranoiq/6307849f7b0799ec7110ae492be19336 to your computer and use it in GitHub Desktop.
Save paranoiq/6307849f7b0799ec7110ae492be19336 to your computer and use it in GitHub Desktop.
#!/bin/bash
# Colors
RED='\033[0;31m'
GREEN='\033[0;32m'
NO_COLOR='\033[0m'
BLUE='\033[0;34m'
YELLOW='\033[0;33m'
NO_COLOR='\033[0m'
width0=1
width3=30
width1=5
width2=6
width4=20
width5=40
# Function to count commits
count_commits() {
local branch="$1"
local base_branch="$2"
local ahead_behind
ahead_behind=$(git rev-list --left-right --count "$base_branch"..."$branch")
echo "$ahead_behind"
}
# Main script
#main_branch=$(git rev-parse HEAD)
main_branch=$(git show-ref -s origin/master)
current_branch=$(git rev-parse --abbrev-ref HEAD)
printf " ${BLUE}%-${width3}s ${GREEN}%-${width1}s ${RED}%-${width2}s ${YELLOW}%-${width4}s ${NO_COLOR}%-${width5}s\n" "Branch" "Ahead" "Behind" "Last Commit" "Last Commit Message"
# Separator line for clarity
printf " ${BLUE}%-${width3}s ${GREEN}%-${width1}s ${RED}%-${width2}s ${YELLOW}%-${width4}s ${NO_COLOR}%-${width5}s\n" "------------------------------" "-----" "------" "--------------------" "----------------------------------------"
format_string="%(objectname:short)@%(refname:short)@%(committerdate:relative)"
IFS=$'\n'
for branchdata in $(git for-each-ref --sort=-authordate --format="$format_string" refs/heads/ ); do # --no-merged
sha=$(echo "$branchdata" | cut -d '@' -f1)
branch=$(echo "$branchdata" | cut -d '@' -f2)
time=$(echo "$branchdata" | cut -d '@' -f3)
if [ "$branch" == "$current_branch" ]; then
main='*'
commit_message=$(git log --format="%B" -n 1 HEAD)
else
main=" "
commit_message=$(git log --format="%B" -n 1 "$branch")
fi
description=$(echo "$commit_message" | head -n 1)
description=${description:0:80}
# Count commits ahead and behind
ahead_behind=$(count_commits "$sha" "$main_branch")
ahead=$(echo "$ahead_behind" | cut -f2)
behind=$(echo "$ahead_behind" | cut -f1)
# Display branch info
printf "${NO_COLOR}%-${width0}s ${BLUE}%-${width3}s ${GREEN}%-${width1}s ${RED}%-${width2}s ${YELLOW}%-${width4}s ${NO_COLOR}%-${width5}s\n" "$main" $branch $ahead $behind "$time" "$description"
done
@paranoiq
Copy link
Author

paranoiq commented Jan 18, 2024

customized https://gist.github.com/schacon/e9e743dee2e92db9a464619b99e94eff (better-git-branch.sh)

changes:

  • references against origin/master (instead of current branch)
  • prints all branches (including merged)
  • marks current branch
  • fixed descriptions (last commit message)

image

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment