sapphic-linux/sapphrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed broken updown logic

Browse source
This commit is contained in:
Penelope Gwen 2024-03-31 19:51:36 -06:00
parent c4f13c800c
commit ab1e7d9bf2
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/bin/sapphrc_updown
View file

@ -10,7 +10,7 @@ gs="$(git status | grep -i 'modified')"
git fetch origin git fetch origin
reslog=$(git log HEAD..origin/main --oneline) reslog=$(git log HEAD..origin/main --oneline)
if [[ "${gs}" == *"modified"* && "${reslog}" == "" ]];then if [[ "${gs}" == *"modified"* && "${reslog}" != "" ]];then
#local AND remote changes exist #local AND remote changes exist
echo "local backup reposity conflict with remote - please manually fix this!" echo "local backup reposity conflict with remote - please manually fix this!"
exit 1 exit 1