diff --git a/applyPatches.sh b/applyPatches.sh index 559a445..fa84a52 100644 --- a/applyPatches.sh +++ b/applyPatches.sh @@ -17,11 +17,6 @@ applyPatch() { cd "$basedir/$target" echo "Resetting $target to $what..." git config commit.gpgSign false - git remote rm origin >/dev/null 2>&1 - git remote add origin $what >/dev/null 2>&1 - git checkout master >/dev/null 2>&1 - git fetch origin >/dev/null 2>&1 - git reset --hard $branch echo " Applying patches to $target..." git am --abort >/dev/null 2>&1 git am --3way "../${pfoldername}-Patches/"*.patch @@ -36,8 +31,5 @@ applyPatch() { } git submodule update --init -cd FastLogin -hash=$(git rev-parse HEAD) -git branch -f main "$hash" applyPatch LimeLogin FastLogin LimeLogin-Plugin main \ No newline at end of file