utils-code/paulirish.git-recent
1
0
Fork 0
mirror of https://github.com/paulirish/git-recent.git synced 2026-09-10 07:26:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

diff_base note. #28

Browse source
This commit is contained in:
Paul Irish 2025-04-15 10:58:09 -07:00
parent aa46ef3070
commit fbb93ae381
No known key found for this signature in database
GPG key ID: 047F4C1E64AD96C0
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
git-recent
View file

@ -28,12 +28,13 @@ fi
branches_format="%(color:yellow)%(refname:short)%(color:reset)"
commits_format="%C(red bold)%h %C(bold blue)%an %C(bold green)%ad %Creset%s"
# The primary branch (eg main or master or w/e)
origin_HEAD=$(cat $(git rev-parse --show-cdup).git/refs/remotes/origin/HEAD | awk '{print $2}')
# The HEAD of the primary branch (eg main or master or w/e), for diffing.
# TODO: some branch mgmt approaches don't work well with this. And may prefer `git log --pretty=format:%H --merges -n 1`. See https://github.com/paulirish/git-recent/issues/28
diff_base=$(cat $(git rev-parse --show-cdup).git/refs/remotes/origin/HEAD | awk '{print $2}')
uniqcommits_cmd="git log --date=human --color=always --format='$commits_format' --no-merges $origin_HEAD..{1}"
uniqcommits_cmd="git log --date=human --color=always --format='$commits_format' --no-merges $diff_base..{1}"
diffbranch_cmd="git diff --color=always $origin_HEAD...{}"
diffbranch_cmd="git diff --color=always $diff_base...{}"
# Progressive enhancement if you have delta or diff-so-fancy
if command -v delta >/dev/null 2>&1; then
diffbranch_cmd="$diffbranch_cmd | delta"