Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Tests

on:
workflow_dispatch:
pull_request:
branches:
- master
Expand Down Expand Up @@ -53,7 +54,7 @@ jobs:
- name: Setup BATS
uses: mig4/setup-bats@v1
with:
bats-version: 1.11.1
bats-version: 1.12.0

- name: Check out code
uses: actions/checkout@v4
Expand Down Expand Up @@ -87,7 +88,7 @@ jobs:
- name: Setup BATS
uses: mig4/setup-bats@v1
with:
bats-version: 1.11.1
bats-version: 1.12.0

- name: Check out code
uses: actions/checkout@v4
Expand Down
9 changes: 6 additions & 3 deletions git-mr
Original file line number Diff line number Diff line change
Expand Up @@ -2422,15 +2422,18 @@ mr_update() {
matchOldLog="^(${_git_mr_commit_prefix})(${oldSha}) ${msgSuffix}"
matchLink="^(${_git_mr_commit_prefix})(\[${oldSha}\]\(${matchOldCommitUrl}\)) ${msgSuffix}"

#local link_icon="🔗"
local link_icon="\xF0\x9F\x94\x97" # Workaround for sed / is_mb_char / mbrtowc bug (Windows)

local consoleShaColor
if [[ -n $oldSha ]]; then if [[ $oldSha == "$currSha" ]]; then
consoleShaColor="$sameColor"; else
consoleShaColor="$updatedColor"; fi; else
consoleShaColor="$newColor"; fi

local forConsole_converted forConsole_link forDescription forDescriptionNew
forConsole_converted="\1$(colorize "$currSha" "$consoleShaColor")🔗✔ \3\4${MD_BR}"
forConsole_link="\1$(colorize "$currSha" "$consoleShaColor")🔗 \3\4${MD_BR}"
forConsole_converted="\1$(colorize "$currSha" "$consoleShaColor")${link_icon}✔ \3\4${MD_BR}"
forConsole_link="\1$(colorize "$currSha" "$consoleShaColor")${link_icon} \3\4${MD_BR}"
forDescription="\1[$currSha]($(regex_escape "$currCommitUrl")) \3\4${MD_BR}"
forDescriptionNew="\1[$currSha]($(regex_escape "$currCommitUrl")) \3"

Expand Down Expand Up @@ -2467,7 +2470,7 @@ mr_update() {
new_commit_line_content="$(echo "$new_commit_line_display" | sed -r -e "s/^(\* \*\*)(${currSha}) (.*)/${forDescriptionNew}/")"
# shellcheck disable=SC2001
new_commit_line_display="$(echo "$new_commit_line_display" |
sed -r -e "s/^(\* \*\*)(${currSha}) (.*)$/\1$(colorize "$currSha" "$consoleShaColor")🔗 \3/"
sed -r -e "s/^(\* \*\*)(${currSha}) (.*)$/\1$(colorize "$currSha" "$consoleShaColor")${link_icon} \3/"
)"
else
new_commit_line_display="$(colorize "$currSha" "$consoleShaColor")🔗 ${currMsg}"
Expand Down