diff --git a/src/squash_fixups.sh b/src/squash_fixups.sh index 3d9d0ea..a929acc 100644 --- a/src/squash_fixups.sh +++ b/src/squash_fixups.sh @@ -13,8 +13,9 @@ squash_fixups() { return 1 fi - # Perform a non-interactive rebase with autosquash - git rebase --autosquash --autostash --keep-empty --rebase-merges -i "$(git merge-base HEAD $(git rev-list --no-walk HEAD))" < /dev/null + # Perform an interactive rebase with autosquash + git rebase -i --autosquash HEAD~$(git rev-list --count HEAD) - echo "Rebase and squash completed for commits starting with 'fixup!'." + echo "Interactive rebase initiated to squash commits starting with 'fixup!'." } + diff --git a/src/squash_fixups.sh.sha256 b/src/squash_fixups.sh.sha256 index f21932a..2e06234 100644 --- a/src/squash_fixups.sh.sha256 +++ b/src/squash_fixups.sh.sha256 @@ -1 +1 @@ -02503d832cfc6ffdf4fd4bf5e4f4adf8057d6d01bcfa31dc251a90d9dd5a483b +3dd9a3855d3c9b1537c16f50b62a960eed969840ce531d4946d09b52e0690f82 diff --git a/src/sum.sh b/src/sum.sh index e2c7063..50bfc8f 100644 --- a/src/sum.sh +++ b/src/sum.sh @@ -6,7 +6,7 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then fi # Function to generate SHA-256 hashes for .sh files in src or dist directories -release_hash() { +calculate_hashes() { local base_dir="$1" # Check if the base directory exists diff --git a/src/sum.sh.sha256 b/src/sum.sh.sha256 index 41c4c04..c83418c 100644 --- a/src/sum.sh.sha256 +++ b/src/sum.sh.sha256 @@ -1 +1 @@ -f5c7f474e279c603a166b3b908f345ff9f8de879e8d39595f6ee95bccc123c5b +004ba4423c45dc5bbf57fe514ba44e07bc303e80e579911a58f265ab42365ba0