From 304a216ba583d24f8a24b911ca64249eec560ed3 Mon Sep 17 00:00:00 2001 From: Professor Bloodstone Date: Mon, 5 Apr 2021 13:14:54 +0200 Subject: [PATCH] [CI-SKIP] Ignore gitignore when adding files in automation Continuation of #5387 Fixes #5456 --- scripts/apatch.sh | 2 +- scripts/importmcdev.sh | 2 +- scripts/init.sh | 4 ++-- scripts/rebuildPatches.sh | 2 +- scripts/upstreamMerge.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/apatch.sh b/scripts/apatch.sh index 38a204691..f56771d9e 100755 --- a/scripts/apatch.sh +++ b/scripts/apatch.sh @@ -52,7 +52,7 @@ fi if [ -f "$file" ] && [[ "$filedata" == *"<<<<<"* ]]; then export summaryfail="$summaryfail\nFAILED TO APPLY: $i" else - $gitcmd add "$i" + $gitcmd add --force "$i" export summarygood="$summarygood\nAPPLIED CLEAN: $i" fi done diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh index d438a5a5c..3e8c8e216 100755 --- a/scripts/importmcdev.sh +++ b/scripts/importmcdev.sh @@ -121,6 +121,6 @@ importLibrary com.mojang datafixerupper com/mojang/serialization Dynamic.java set -e cd "$workdir/Spigot/Spigot-Server/" rm -rf nms-patches applyPatches.sh makePatches.sh >/dev/null 2>&1 -$gitcmd add . --force -A >/dev/null 2>&1 +$gitcmd add --force . -A >/dev/null 2>&1 echo -e "mc-dev Imports\n\n$MODLOG" | $gitcmd commit . -F - ) diff --git a/scripts/init.sh b/scripts/init.sh index 9c51762ae..8b1929c83 100755 --- a/scripts/init.sh +++ b/scripts/init.sh @@ -54,7 +54,7 @@ do mkdir -p "$(dirname $cb/"$file")" cp "$nms/$file" "$cb/$file" done < <(find nms-patches -type f -print0) -$gitcmd add src +$gitcmd add --force src $gitcmd commit -m "Minecraft $ $(date)" --author="Vanilla " # apply patches @@ -71,7 +71,7 @@ do "$patch" -d src/main/java -p 1 < "$patchFile" done < <(find nms-patches -type f -print0) -$gitcmd add src +$gitcmd add --force src $gitcmd commit -m "CraftBukkit $ $(date)" --author="CraftBukkit " $gitcmd checkout -f HEAD~2 ) diff --git a/scripts/rebuildPatches.sh b/scripts/rebuildPatches.sh index df1934b49..a910d6f23 100755 --- a/scripts/rebuildPatches.sh +++ b/scripts/rebuildPatches.sh @@ -52,7 +52,7 @@ function savePatches { $gitcmd format-patch --zero-commit --full-index --no-signature --no-stat -N -o "$basedir/${what_name}-Patches/" upstream/upstream >/dev/null cd "$basedir" - $gitcmd add -A "$basedir/${what_name}-Patches" + $gitcmd add --force -A "$basedir/${what_name}-Patches" if [ "$nofilter" == "0" ]; then cleanupPatches "$basedir/${what_name}-Patches" fi diff --git a/scripts/upstreamMerge.sh b/scripts/upstreamMerge.sh index cacfb8dec..f011f708f 100755 --- a/scripts/upstreamMerge.sh +++ b/scripts/upstreamMerge.sh @@ -16,7 +16,7 @@ function update { $gitcmd fetch && $gitcmd clean -fd && $gitcmd reset --hard origin/master refRemote=$(git rev-parse HEAD) cd ../ - $gitcmd add $1 -f + $gitcmd add --force $1 refHEAD=$(getRef HEAD "$workdir/$1") echo "$1 $refHEAD - $refRemote" if [ "$refHEAD" != "$refRemote" ]; then