一键脚本
bash <(curl -sL gitee.com/meimolihan/cmdbox/raw/master/sh/git_hard_reset_pull.sh) /vol1/1000/GitHub/fan-md
bash <(curl -sL ../sh/git_hard_reset_pull.sh) /vol1/1000/GitHub/fan-md
补充说明
该脚本提供 Git 仓库的远程强制拉取功能,通过 git fetch origin + git reset --hard origin/<分支> 将本地完全硬覆盖为远程分支状态,支持交互式预览远程提交、命令行半交互与免交互模式,适合本地仓库已混乱、希望完全以远程为准的高危场景。
效果预览
功能特点
- 远程预览:执行前先
git fetch origin并显示远程分支最近 8 条提交,便于确认目标状态 - 双重模式:
y拉取远程并硬覆盖本地,n仅预览不修改本地仓库 - 免交互模式:附加
-y参数自动确认拉取远程并硬覆盖本地 - 完全覆盖:丢弃本地所有未提交修改与未推送提交,以远程分支为准
- 彩色输出:成功(绿色)、警告(黄色)、错误(红色)清晰区分
使用方式
| 模式 | 执行命令 | 说明 |
|---|---|---|
| 交互模式 | ./git-hard-reset-pull.sh |
无参数,进入交互菜单 |
| 半交互 | ./git-hard-reset-pull.sh /路径/仓库 |
执行前二次确认 |
| 免交互 | ./git-hard-reset-pull.sh /路径/仓库 -y |
自动确认拉取远程并覆盖本地 |
流程说明
启动(交互模式)
↓
检查当前分支
↓
git fetch origin 并显示远程分支最近 8 条提交
↓
选择执行方式:y 拉远程并覆盖本地 / n 仅预览 / 0 取消退出
↓
git fetch origin
↓
git reset --hard origin/<分支>
↓
本地仓库完全同步至远程分支
注意事项
- 高危操作:
git reset --hard origin/<分支>会永久丢弃本地所有未提交修改与未推送提交,请务必先备份 n选项仅预览远程提交信息,不会修改本地仓库,适合先观察再决定- 免交互模式
-y不可撤销,执行前请确认本地无需要保留的改动 - 需要已配置远程仓库 origin 且网络可达,否则 fetch 会失败
脚本源码
#!/bin/bash
set -uo pipefail
gl_hui='\033[38;5;59m'
gl_hong='\033[38;5;9m'
gl_lv='\033[38;5;10m'
gl_huang='\033[38;5;11m'
gl_lan='\033[38;5;32m'
gl_bai='\033[38;5;15m'
gl_zi='\033[38;5;13m'
gl_bufan='\033[38;5;14m'
reset=$'\033[0m'
log_info() { echo -e "${gl_lan}[信息]${gl_bai} $*"; }
log_ok() { echo -e "${gl_lv}[成功]${gl_bai} $*"; }
log_warn() { echo -e "${gl_huang}[警告]${gl_bai} $*"; }
log_error() { echo -e "${gl_hong}[错误]${gl_bai} $*" >&2; }
break_end() {
echo -e "${gl_lv}操作完成${gl_bai}"
echo -e "${gl_bai}按任意键继续 ${gl_hong}.${gl_huang}.${gl_lv}.${gl_bai}\c"
read -r -n 1 -s -p ""
echo ""
clear
}
sleep_fractional() {
local seconds=$1
if sleep "$seconds" 2>/dev/null; then return 0; fi
if command -v perl >/dev/null 2>&1; then perl -e "select(undef, undef, undef, $seconds)"; return 0; fi
if command -v python3 >/dev/null 2>&1; then python3 -c "import time; time.sleep($seconds)"; return 0; fi
if command -v python >/dev/null 2>&1; then python -c "import time; time.sleep($seconds)"; return 0; fi
local int_seconds=$(echo "$seconds" | awk '{print int($1+0.999)}')
sleep "$int_seconds"
}
cancel_return() {
local menu_name="${1:-退出脚本}"
echo -ne "${gl_lv}即将返回 ${gl_huang}${menu_name} ${gl_hong}.${gl_huang}.${gl_lv}.${gl_bai}\c"
sleep_fractional 0.5
echo -ne "${gl_hong}.${gl_huang}.${gl_lv}.${gl_bai}\c"
sleep_fractional 0.6
echo ""
clear
}
exit_script() {
local frames=("⠋" "⠙" "⠹" "⠸" "⠼" "⠴" "⠦" "⠧" "⠇" "⠏")
local dots=(
"${gl_hong}."
"${gl_huang}."
"${gl_lv}."
"${gl_bufan}."
"${gl_zi}."
)
local dot_buffer=""
local frame_len=${#frames[@]}
local dot_idx=0
local total_dots=${#dots[@]}
for ((i=0; i<20; i++)); do
if (( i > 0 && i % 3 == 0 && dot_idx < total_dots )); then
dot_buffer+=${dots[$dot_idx]}
((dot_idx++))
fi
echo -ne "\r\033[K${gl_bufan}${frames[i % frame_len]}${gl_bai} 正在退出 ${dot_buffer}"
sleep_fractional 0.06
done
echo -e "\r\033[K${gl_lv}✓${gl_bai} 成功退出\n"
clear
exit 0
}
handle_y_n() {
echo -ne "\r${gl_hong}无效的选择,请输入 ${gl_bai}(${gl_lv}y${gl_bai}/${gl_hong}n${gl_bai}/${gl_zi}0${gl_bai}) ${gl_hong}.${gl_huang}.${gl_lv}.${gl_bai}\c"
sleep_fractional 0.3
echo -ne "\r${gl_huang}无效的选择,请输入 ${gl_bai}(${gl_lv}y${gl_bai}/${gl_hong}n${gl_bai}/${gl_zi}0${gl_bai}) ${gl_hong}.${gl_huang}.${gl_lv}.${gl_bai}\c"
sleep_fractional 0.3
echo -ne "\r${gl_lv}无效的选择,请输入 ${gl_bai}(${gl_lv}y${gl_bai}/${gl_hong}n${gl_bai}/${gl_zi}0${gl_bai}) ${gl_hong}.${gl_huang}.${gl_lv}.${gl_bai}\c"
sleep_fractional 0.6
echo ""
return 2
}
cancel_empty() {
local menu_name="${1:-上一级选单}"
echo -e "${gl_hong}空输入,返回 ${gl_huang}${menu_name} ${gl_hong}.${gl_huang}.${gl_lv}.${gl_bai}\c"
sleep_fractional 0.5
echo -ne "${gl_hong}.${gl_huang}.${gl_lv}.${gl_bai}\c"
sleep_fractional 0.6
echo ""
clear
}
handle_invalid_input() {
echo -ne "\r\033[K${gl_huang}无效的输入,请重新输入! ${gl_zi} 1 ${gl_huang} 秒后返回"
sleep_fractional 1
echo -ne "\r\033[K${gl_lv}无效的输入,请重新输入! ${gl_zi}0${gl_lv} 秒后返回"
sleep_fractional 0.5
echo -ne "\r\033[K"
return 2
}
confirm_action() {
local prompt="$1"
local ans
while true; do
read -r -p "$(echo -e "${gl_huang}${prompt} ${gl_bai}[${gl_lv}y${gl_bai}=拉远程并覆盖本地 / ${gl_hong}n${gl_bai}=仅预览不修改 / ${gl_zi}0${gl_bai}=取消退出]: ")" ans
case "$ans" in
y|Y) return 0 ;;
n|N) return 1 ;;
0) exit_script ;;
*) handle_y_n ;;
esac
done
}
check_git_repo() {
local repo_path="$1"
if [[ ! -d "${repo_path}" ]]; then
log_error "目录不存在:${repo_path}"
return 1
fi
cd "${repo_path}" || { log_error "无法进入目录 ${repo_path}"; return 1; }
if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
log_error "当前目录不是Git仓库!"
return 1
fi
return 0
}
list_recent_8_commit() {
local -n out_arr=$1
out_arr=()
while IFS= read -r line; do
out_arr+=("${line}")
done < <(git log --oneline -8)
}
show_remote_info() {
local br="$1"
git fetch origin
git log --oneline -n 8 "origin/${br}"
}
run_hard_reset_pull() {
local repo_path="$1"
local auto_yes="$2"
if ! check_git_repo "${repo_path}"; then
return 1
fi
local br_name
br_name=$(git rev-parse --abbrev-ref HEAD)
show_remote_info "${br_name}"
echo -e "${gl_bufan}————————————————————————————————————————————————${gl_bai}"
log_warn "⚠️ 操作说明:git fetch origin && git reset --hard origin/${br_name}"
log_warn "⚠️ 本地所有未提交修改、未提交的提交全部丢失,完全以远程分支覆盖本地!"
local action_code=0
if [[ "${auto_yes}" == "1" ]]; then
log_info "免交互模式,自动确认:拉取远程并硬覆盖本地"
action_code=0
else
echo -e "${gl_bufan}————————————————————————————————————————————————${gl_bai}"
confirm_action "请选择执行方式"
action_code=$?
case "${action_code}" in
2)
log_info "已选择0,取消,不执行任何操作"
return 0
;;
1)
log_info "已选择n,仅预览,不修改本地仓库"
return 0
;;
esac
fi
log_info "执行 git fetch origin"
git fetch origin
log_info "执行 git reset --hard origin/${br_name}"
git reset --hard "origin/${br_name}"
log_ok "✅ 本地仓库已完全同步至远程 origin/${br_name}"
return 0
}
menu_git_hard_pull() {
local repo_path="${1:-.}"
while true; do
clear
echo -e "${gl_zi}>>> 远程强制拉取,硬覆盖本地${gl_bai}"
echo -e "${gl_bufan}————————————————————————————————————————————————${gl_bai}"
if ! check_git_repo "${repo_path}"; then
cancel_return "退出脚本"
return 1
fi
local br_name
br_name=$(git rev-parse --abbrev-ref HEAD)
log_info "当前本地分支:${br_name}"
echo -e "${gl_huang}说明:拉取远程origin/${br_name},硬重置覆盖本地,本地未保存改动全部丢失${gl_bai}"
echo -e "${gl_bufan}————————————————————————————————————————————————${gl_bai}"
run_hard_reset_pull "${repo_path}" "0"
echo -e "${gl_bufan}————————————————————————————————————————————————${gl_bai}"
break_end
done
}
cli_main() {
local repo_path=""
local auto_yes=0
for arg in "$@"; do
case "${arg}" in
-y) auto_yes=1 ;;
*)
if [[ -d "${arg}" ]]; then
repo_path="${arg}"
fi
;;
esac
done
if [[ -z "${repo_path}" ]]; then
log_error "参数不足!用法:"
log_info "交互模式(无参数): $0"
log_info "半交互: $0 /vol1/1000/GitHub/fan-md"
log_info "免交互: $0 /vol1/1000/GitHub/fan-md -y"
exit 1
fi
run_hard_reset_pull "${repo_path}" "${auto_yes}"
}
main() {
if [[ $# -eq 0 ]]; then
menu_git_hard_pull "."
else
cli_main "$@"
fi
}
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
main "$@"
fi
创建本地脚本
new_script="new_test.sh"
cat > "$new_script" << 'EOF'
#!/bin/bash
# 粘贴脚本源码
EOF
# 保留本地脚本,去掉 rm -f "$new_script"
chmod +x "$new_script" && ./"$new_script" && rm -f "$new_script"