Skip to content
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

Modify to work when only a single commit, add parameter checks #850

Merged
merged 3 commits into from
Jun 21, 2020
Merged

Modify to work when only a single commit, add parameter checks #850

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dca93e
Modify to work when only a single commit, add parameter checks
Jun 18, 2020
6ccd2fa
Cleanup code
Jun 19, 2020
27f42be
Tighten numeric regex
Jun 20, 2020
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
57 changes: 46 additions & 11 deletions bin/git-undo
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
#!/usr/bin/env bash

back="^"
cstr="commits"
ccnt=$(git rev-list --count HEAD)
if [ $ccnt -eq 1 ]; then cstr="commit"; fi
parm3=""

function _undo()
{
type=${1:-soft}
undo_cnt=${2:-1}
reset=${3:-""}

if [ $undo_cnt -gt $ccnt ]; then
echo "Only $ccnt $cstr, cannot undo $undo_cnt"
elif [ "$type" = "hard" ] && [ $ccnt -eq $undo_cnt ]; then
echo "Cannot hard undo all commits"
elif [ "$type" = "soft" ] && [ $ccnt -eq 1 ]; then
git update-ref -d HEAD
else
git reset --$type HEAD~$undo_cnt
fi
if [ "$reset" != "" ]; then git reset; fi
}

case "$1" in
-h)
Expand All @@ -12,26 +33,40 @@ EOL
read -r res
case "${res}" in
"Y" | "y")
test $2 -gt 1 > /dev/null 2>&1 && back="~$2"
git reset --hard HEAD$back
exit $?
parm1=hard
parm2=${2:-1}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better to use more reasonable argument name than parmX.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I kept them generic on purpose. The names in the function are what matter. If you would like to name the parameters, I'll be glad to use them.

;;
* )
exit 0
;;
esac
;;
--hard)
test $2 -gt 1 > /dev/null 2>&1 && back="~$2"
git reset --hard HEAD$back
parm1=hard
parm2=${2:-1}
;;
-s|--soft)
test $2 -gt 1 > /dev/null 2>&1 && back="~$2"
git reset --soft HEAD$back
parm1=soft
parm2=${2:-1}
parm3=reset
;;
"")
parm1=soft
parm2=1
;;
*[!0-9]*)
echo "Invalid parameter: $1"
exit 1
;;
*)
test $1 -gt 1 > /dev/null 2>&1 && back="~$1"
git reset --soft HEAD$back
git reset
parm1=soft
parm2="$1"
;;
esac

if [[ ! $parm2 =~ ^[1-9][0-9]*$ ]]; then
echo "Invalid undo count: $parm2"
exit 1
fi

_undo $parm1 $parm2 $parm3