sync_client_software: depth=1 fetch, clean from repo root; gitignore cleanup #25

2026-05-04T19:32:00+02:00

unbrot commented

2026-05-04 19:32:00 +02:00

Changes

sync_client_software.sh

Replace broken git rebase HEAD^ with git fetch --depth=1 + git reset --hard FETCH_HEAD to keep only the latest commit on each upgrade
Add git -C "${SYSCONFIGPATH}" clean -fd to remove untracked non-gitignored files (e.g. stale files synced in from Nextcloud); -C is required because the script runs from system_setup/ and git clean scopes to the current directory only
Add git gc --prune=now to immediately purge unreachable history objects

.gitignore

Remove duplicate config/.sync_*.db entry
Broaden config/setup_system.conf.bak to config/*.bak to cover all timestamped backup files
Add config.d/*.bak for the same reason

## Changes **sync_client_software.sh** - Replace broken `git rebase HEAD^` with `git fetch --depth=1` + `git reset --hard FETCH_HEAD` to keep only the latest commit on each upgrade - Add `git -C "${SYSCONFIGPATH}" clean -fd` to remove untracked non-gitignored files (e.g. stale files synced in from Nextcloud); `-C` is required because the script runs from `system_setup/` and `git clean` scopes to the current directory only - Add `git gc --prune=now` to immediately purge unreachable history objects **.gitignore** - Remove duplicate `config/.sync_*.db` entry - Broaden `config/setup_system.conf.bak` to `config/*.bak` to cover all timestamped backup files - Add `config.d/*.bak` for the same reason

unbrot added 2 commits 2026-05-04 19:32:00 +02:00

sync_client_software: fetch depth=1 and clean untracked files on upgrade 1ac952c094

Replace the broken `git rebase HEAD^` with a proper shallow fetch:
- `git fetch --depth=1` limits local history to one commit, regardless of server history
- `git reset --hard FETCH_HEAD` syncs the working tree to the fetched tip
- `git clean -fd` removes untracked non-ignored files left by old versions
- `git gc --prune=now` immediately purges unreachable history objects

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

sync_client_software: run git clean from repo root a3c95ab146

git clean -fd scopes to the current directory and below, so running it
from the system_setup/ subdirectory missed untracked files in sibling
dirs like config/. Use -C "${SYSCONFIGPATH}" to always clean from the
repo root regardless of invocation directory.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

unbrot added 1 commit 2026-05-04 19:35:45 +02:00

gitignore: removed double line d62d0038e6

unbrot added 1 commit 2026-05-04 19:40:52 +02:00

include *.bak in config dirs to gitignore 83c25cd45d

unbrot changed title from ~~sync_client_software: depth=1 fetch, clean untracked files from repo root~~ to sync_client_software: depth=1 fetch, clean from repo root; gitignore cleanup

2026-05-04 19:42:46 +02:00

obel1x merged commit cc10fb5b48 into main

2026-05-04 19:49:39 +02:00

obel1x referenced this issue from a commit

2026-05-04 19:49:41 +02:00

Merge pull request 'sync_client_software: depth=1 fetch, clean from repo root; gitignore cleanup' (#25) from unbrot/fedora-OEMDRV:main into main

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: obel1x/fedora-OEMDRV#25

Allow edits from maintainers