unbrot/fedora-OEMDRV
1
0
Fork 0
forked from obel1x/fedora-OEMDRV
Code Pull Requests Activity

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

Browse Source 
Reviewed-on: obel1x/fedora-OEMDRV#25
This commit is contained in:
Daniel Pätzold
2026-05-04 19:49:39 +02:00
parent 53b87fbe76 83c25cd45d
commit cc10fb5b48
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+2 -2
View File
@@ -4,11 +4,11 @@
client_software/.sync_*.db client_software/.sync_*.db
client_software/setup_system.conf client_software/setup_system.conf
config/setup_system.conf config/setup_system.conf
config/setup_system.conf.bak config/*.bak
config/skel.tar.zst config/skel.tar.zst
config/.sync_*.db config/.sync_*.db
config/.sync_*.db
config.d/*.conf config.d/*.conf
config.d/*.sys config.d/*.sys
config.d/*.bak
ks_pc_prof/* ks_pc_prof/*
ks.cfg ks.cfg
system_setup/sync_client_software.sh
+2 -2
View File
@@ -51,8 +51,8 @@ if [[ ! -z "${REPO_URL}" ]]; then
else else
# Doing upgrade, discarding all local changes frist (is more save than forced pull) # Doing upgrade, discarding all local changes frist (is more save than forced pull)
echo "Checks have passed, we are now upgrading via git." echo "Checks have passed, we are now upgrading via git."
#Fetch latest Updates and remove all history #Fetch latest commit only (depth=1), reset working tree, purge old history and untracked files
git fetch origin && git reset --hard origin/${REPO_BRANCH} && git rebase HEAD^ git fetch --depth=1 origin ${REPO_BRANCH} && git reset --hard FETCH_HEAD && git -C "${SYSCONFIGPATH}" clean -fd && git gc --prune=now --quiet
if [[ $? -ne 0 ]]; then if [[ $? -ne 0 ]]; then
echo "Error: Failure while updating, will continue as is." echo "Error: Failure while updating, will continue as is."
fi fi