Skip to content

choose branch by index and -h --help argument #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

choose branch by index and -h --help argument #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 21 additions & 6 deletions git-squash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ set -e

CURRENT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
TEMP_BRANCH="temp$(date +%s)"
INDEX=0
BRANCHES=()

if [ "$1" == "" ]; then
if [ "$1" == "-h" ] || [ "$1" == "--help" ]; then
echo "Squashes all commits just like GitHub squash merge"
echo ""
echo "Usage: git squash <branch>"
Expand All @@ -20,19 +22,32 @@ if [ "$(git status -s -u no)" != "" ]; then
exit 1
fi

if ! git show-ref "$1" > /dev/null; then
echo "Branch $1 does not exist"
exit 1
if [ "$1" == "" ]; then
for i in $(git for-each-ref --format='%(refname:short)' refs/heads)
do
echo "$INDEX $i"
INDEX=$(expr $INDEX + 1)
BRANCHES+=("$i")
done
read -p "select branch:" $BRANCH_ID
SELECTED_BRANCH="${BRANCHES[$BRANCH_ID]}"
echo ""
echo "selected branch: ${SELECTED_BRANCH}"
if ! git show-ref "$SELECTED_BRANCH" > /dev/null; then
echo "Branch $1 does not exist"
exit 1
fi

fi

FIRST_COMMIT_ID=$(git log $1.. --no-merges --pretty=format:%h | tail -1)
FIRST_COMMIT_ID=$(git log $SELECTED_BRANCH.. --no-merges --pretty=format:%h | tail -1)

if [ "$FIRST_COMMIT_ID" == "" ]; then
echo "There are no changes to be squashed"
exit 1
fi

git checkout -q -b "$TEMP_BRANCH" "$1"
git checkout -q -b "$TEMP_BRANCH" "$SELECTED_BRANCH"

function finish {
git checkout -q --force "$CURRENT_BRANCH"
Expand Down