Skip to content

Fix fatal update repository error #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gbp merged 1 commit into from
Nov 20, 2025
Merged

Fix fatal update repository error #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions bin/install-site.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,17 +230,16 @@ clone_or_update_repository() {
notice_msg skipping as development install...
else
notice_msg updating...
cd $REPOSITORY
git remote set-url origin "$REPOSITORY_URL"
git fetch --tags origin
su -l -c "cd $REPOSITORY && git remote set-url origin '$REPOSITORY_URL'" "$UNIX_USER"
su -l -c "cd $REPOSITORY && git fetch --tags origin" "$UNIX_USER"
# Check that there are no uncommitted changes before doing a
# git reset --hard:
git diff --quiet || { echo "There were changes in the working tree in $REPOSITORY; exiting."; exit 1; }
git diff --cached --quiet || { echo "There were staged but uncommitted changes in $REPOSITORY; exiting."; exit 1; }
su -l -c "cd $REPOSITORY && git diff --quiet" "$UNIX_USER" || { echo "There were changes in the working tree in $REPOSITORY; exiting."; exit 1; }
su -l -c "cd $REPOSITORY && git diff --cached --quiet" "$UNIX_USER" || { echo "There were staged but uncommitted changes in $REPOSITORY; exiting."; exit 1; }
# If that was fine, carry on:
git reset --quiet --hard origin/"$BRANCH"
git submodule --quiet sync
git submodule --quiet update --recursive
su -l -c "cd $REPOSITORY && git reset --quiet --hard origin/'$BRANCH'" "$UNIX_USER"
su -l -c "cd $REPOSITORY && git submodule --quiet sync" "$UNIX_USER"
su -l -c "cd $REPOSITORY && git submodule --quiet update --recursive" "$UNIX_USER"
fi
else
PARENT="$(dirname $REPOSITORY)"
Expand Down
15 changes: 7 additions & 8 deletions shlib/installfns
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,17 +230,16 @@ clone_or_update_repository() {
notice_msg skipping as development install...
else
notice_msg updating...
cd $REPOSITORY
git remote set-url origin "$REPOSITORY_URL"
git fetch --tags origin
su -l -c "cd $REPOSITORY && git remote set-url origin '$REPOSITORY_URL'" "$UNIX_USER"
su -l -c "cd $REPOSITORY && git fetch --tags origin" "$UNIX_USER"
# Check that there are no uncommitted changes before doing a
# git reset --hard:
git diff --quiet || { echo "There were changes in the working tree in $REPOSITORY; exiting."; exit 1; }
git diff --cached --quiet || { echo "There were staged but uncommitted changes in $REPOSITORY; exiting."; exit 1; }
su -l -c "cd $REPOSITORY && git diff --quiet" "$UNIX_USER" || { echo "There were changes in the working tree in $REPOSITORY; exiting."; exit 1; }
su -l -c "cd $REPOSITORY && git diff --cached --quiet" "$UNIX_USER" || { echo "There were staged but uncommitted changes in $REPOSITORY; exiting."; exit 1; }
# If that was fine, carry on:
git reset --quiet --hard origin/"$BRANCH"
git submodule --quiet sync
git submodule --quiet update --recursive
su -l -c "cd $REPOSITORY && git reset --quiet --hard origin/'$BRANCH'" "$UNIX_USER"
su -l -c "cd $REPOSITORY && git submodule --quiet sync" "$UNIX_USER"
su -l -c "cd $REPOSITORY && git submodule --quiet update --recursive" "$UNIX_USER"
fi
else
PARENT="$(dirname $REPOSITORY)"
Expand Down
Loading