jeremy/dotstate-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ensure reset works with local modifications

Browse Source
This commit is contained in:
jeremy
2026-08-01 20:15:43 -04:00
parent 425ed8a59d
commit d03a678e6e
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bootstrap.sh
+1 -1
View File
@@ -182,7 +182,7 @@ update_repo() {
local old_sha local old_sha
old_sha=$(git rev-parse HEAD) old_sha=$(git rev-parse HEAD)
git fetch origin &>/dev/null && git reset --hard origin/master &>/dev/null && git clean -fd &>/dev/null git fetch origin &>/dev/null && git reset --hard origin/master &>/dev/null && git clean -fd &>/dev/null
git log --format='%C(yellow)%h%C(reset) %C(cyan)%ar%C(reset) %s' "$old_sha"..HEAD git log --format='%C(yellow)%h%C(reset) %C(cyan)%ar%C(reset) %s' -10
else else
info "Repository not found. Cloning..." info "Repository not found. Cloning..."
git clone --depth=1 "$REPO_URL" "$TARGET_DIR" &>/dev/null git clone --depth=1 "$REPO_URL" "$TARGET_DIR" &>/dev/null
default/.config/zsh/functions.zsh
+4 -4
View File
@@ -28,17 +28,17 @@ dotstate-update() {
remote_sha=$(timeout 5 git ls-remote "$REPO_URL" HEAD | awk '{print $1}') remote_sha=$(timeout 5 git ls-remote "$REPO_URL" HEAD | awk '{print $1}')
[[ -z "$remote_sha" ]] && { cd ~; return 0; } [[ -z "$remote_sha" ]] && { cd ~; return 0; }
local_sha=$(git rev-parse HEAD) local_sha=$(git rev-parse HEAD)
if [[ "$remote_sha" == "$local_sha" ]]; then local has_changes=false
[[ -n "$(git status --porcelain)" ]] && has_changes=true
if [[ "$remote_sha" == "$local_sha" && "$has_changes" == "false" ]]; then
cd ~ cd ~
return 0 return 0
fi fi
warn "Dotfiles out of date. Updating..." warn "Dotfiles out of date. Updating..."
printf "\033[1;34m────────────────────────────────────────────────────\033[0m\n" printf "\033[1;34m────────────────────────────────────────────────────\033[0m\n"
local old_sha
old_sha=$(git rev-parse HEAD)
git fetch origin &>/dev/null && git reset --hard origin/master &>/dev/null && git clean -fd &>/dev/null git fetch origin &>/dev/null && git reset --hard origin/master &>/dev/null && git clean -fd &>/dev/null
git log -5 --format='%C(yellow)%h%C(reset) %C(cyan)%ar%C(reset) %s' "$old_sha"..HEAD git log -5 --format='%C(yellow)%h%C(reset) %C(cyan)%ar%C(reset) %s'
printf "\033[1;34m────────────────────────────────────────────────────\033[0m\n" printf "\033[1;34m────────────────────────────────────────────────────\033[0m\n"
cd ~ cd ~
dotstate doctor --fix &>/dev/null dotstate doctor --fix &>/dev/null