2020-05-11 01:56:27 +00:00
|
|
|
#!/usr/bin/env bash
|
2020-04-10 06:09:08 +00:00
|
|
|
#
|
|
|
|
# unstage the selected staged file
|
|
|
|
# or reset the commit to certain point
|
|
|
|
#
|
|
|
|
# @params
|
|
|
|
# Globals
|
|
|
|
# ${mydir}: current directory of the script
|
2020-04-24 07:26:45 +00:00
|
|
|
# ${reset_commit}: search commits and reset selected commit instead of files
|
2020-04-24 06:21:41 +00:00
|
|
|
# ${reset_option}: git reset flag, --mixed | --soft | --hard
|
2020-04-17 07:55:22 +00:00
|
|
|
# ${all_files}: search all files and select a commit to reset
|
|
|
|
# ${selected_files}: selected file to unstage
|
|
|
|
# ${selected_commit}: selected commit to reset
|
2020-04-24 07:26:45 +00:00
|
|
|
# ${confirm}: confirmation status of the user
|
|
|
|
# Arguments
|
|
|
|
# -h: show help message and quit
|
|
|
|
# -a: select files and select a commit to reset the fiel back to selected commit
|
|
|
|
# -c: reset commit
|
|
|
|
# -S: use --soft flag
|
|
|
|
# -H: use --hard flag
|
2020-04-10 06:09:08 +00:00
|
|
|
|
|
|
|
set -e
|
2020-04-17 07:55:22 +00:00
|
|
|
set -f
|
2020-04-10 06:09:08 +00:00
|
|
|
|
2020-05-13 07:30:54 +00:00
|
|
|
mydir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
2020-04-14 07:17:42 +00:00
|
|
|
source "${mydir}"/../helper/set_variable.sh
|
|
|
|
source "${mydir}"/../helper/get_confirmation.sh
|
2020-04-16 06:21:02 +00:00
|
|
|
source "${mydir}"/../helper/git_query.sh
|
2020-04-10 06:09:08 +00:00
|
|
|
|
|
|
|
function usage() {
|
2020-05-13 03:52:28 +00:00
|
|
|
echo -e "Usage: dotbare freset [-h] [-a] [-c] [-S] [-H] ...\n"
|
2020-04-10 06:09:08 +00:00
|
|
|
echo -e "Reset/Unstage the selected staged file"
|
2020-04-11 06:38:05 +00:00
|
|
|
echo -e "Or reset the HEAD to certain commits by using -c flag\n"
|
2020-04-10 06:09:08 +00:00
|
|
|
echo -e "optional arguments:"
|
2020-05-10 22:52:06 +00:00
|
|
|
echo -e " -h\tshow this help message and exit"
|
|
|
|
echo -e " -a\tselect files and then select a commit to reset the file back to the selected comit"
|
|
|
|
echo -e " -c\treset commit to certain commit, default --mixed flag, reset HEAD to certain commit put all changes into modified states"
|
|
|
|
echo -e " -S\treset commit using --soft flag, reset HEAD to certain commit without modify working tree"
|
|
|
|
echo -e " -H\treset commit using --hard flag, reset HEAD to certain commit dicard all changes from the working tree"
|
2020-05-15 08:04:43 +00:00
|
|
|
echo -e " -y\tconfirm action by default and skip confirmation"
|
2020-04-10 06:09:08 +00:00
|
|
|
}
|
|
|
|
|
2020-04-24 07:26:45 +00:00
|
|
|
reset_commit=""
|
2020-04-10 07:20:13 +00:00
|
|
|
reset_option="--mixed"
|
2020-04-17 07:21:16 +00:00
|
|
|
all_files=""
|
2020-04-10 06:41:12 +00:00
|
|
|
|
2020-05-15 08:04:43 +00:00
|
|
|
while getopts ":hacSHy" opt
|
2020-04-10 06:09:08 +00:00
|
|
|
do
|
|
|
|
case "$opt" in
|
2020-04-17 07:21:16 +00:00
|
|
|
a)
|
|
|
|
all_files="true"
|
|
|
|
;;
|
2020-04-10 06:41:12 +00:00
|
|
|
c)
|
2020-04-24 07:26:45 +00:00
|
|
|
reset_commit="true"
|
2020-04-10 06:41:12 +00:00
|
|
|
;;
|
2020-04-10 07:20:13 +00:00
|
|
|
S)
|
|
|
|
reset_option="--soft"
|
|
|
|
;;
|
|
|
|
H)
|
|
|
|
reset_option="--hard"
|
|
|
|
;;
|
2020-05-15 08:04:43 +00:00
|
|
|
y)
|
|
|
|
confirm='y'
|
|
|
|
;;
|
2020-04-10 06:09:08 +00:00
|
|
|
h)
|
|
|
|
usage
|
|
|
|
exit 0
|
|
|
|
;;
|
|
|
|
*)
|
|
|
|
echo "Invalid option: ${OPTARG}" >&2
|
|
|
|
usage
|
|
|
|
exit 1
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
done
|
|
|
|
|
2020-04-24 07:26:45 +00:00
|
|
|
if [[ -n "${reset_commit}" ]]; then
|
2020-04-17 07:21:16 +00:00
|
|
|
selected_commit=$(get_commit)
|
|
|
|
[[ -z "${selected_commit}" ]] && exit 0
|
2020-05-15 08:04:43 +00:00
|
|
|
[[ -z "${confirm}" ]] && confirm=$(get_confirmation "Reset HEAD to ${selected_commit} ${reset_option}?")
|
|
|
|
[[ "${confirm}" != 'y' ]] && exit 1
|
2020-04-17 07:21:16 +00:00
|
|
|
/usr/bin/git --git-dir="${DOTBARE_DIR}" --work-tree="${DOTBARE_TREE}" reset "${selected_commit}" "${reset_option}"
|
2020-04-10 06:41:12 +00:00
|
|
|
else
|
2020-04-17 07:21:16 +00:00
|
|
|
if [[ -z "${all_files}" ]]; then
|
2020-04-21 04:50:51 +00:00
|
|
|
selected_files=$(get_modified_file 'select files to unstage' 'staged' | tr '\n' ' ')
|
2020-04-17 07:21:16 +00:00
|
|
|
[[ -z "${selected_files}" ]] && exit 0
|
2020-04-17 07:55:22 +00:00
|
|
|
# shellcheck disable=SC2086
|
2020-04-17 07:21:16 +00:00
|
|
|
/usr/bin/git --git-dir="${DOTBARE_DIR}" --work-tree="${DOTBARE_TREE}" reset HEAD ${selected_files}
|
|
|
|
else
|
|
|
|
selected_files=$(get_git_file 'select a file to reset' | tr '\n' ' ')
|
|
|
|
[[ -z "${selected_files}" ]] && exit 0
|
|
|
|
selected_commit=$(get_commit "select the target commit" "${selected_files}")
|
|
|
|
[[ -z "${selected_commit}" ]] && exit 0
|
2020-04-17 07:55:22 +00:00
|
|
|
# shellcheck disable=SC2086
|
2020-04-17 07:21:16 +00:00
|
|
|
/usr/bin/git --git-dir="${DOTBARE_DIR}" --work-tree="${DOTBARE_TREE}" reset "${selected_commit}" ${selected_files}
|
|
|
|
fi
|
2020-04-10 06:41:12 +00:00
|
|
|
fi
|