diff options
| author | Mariell Hoversholm <[email protected]> | 2021-03-19 18:25:18 +0100 |
|---|---|---|
| committer | Mariell Hoversholm <[email protected]> | 2021-03-19 18:36:06 +0100 |
| commit | fac9cc5d5cea8866a82e8fc91b3e014a211e2ba8 (patch) | |
| tree | 25c0ba73bb7ba09235622e853438d52fe39ffb01 /scripts | |
| parent | 087aa70e7cee6357f56b58ae0d2caecdb9ecf01e (diff) | |
| download | Paper-fac9cc5d5cea8866a82e8fc91b3e014a211e2ba8.tar.gz Paper-fac9cc5d5cea8866a82e8fc91b3e014a211e2ba8.zip | |
[CI-SKIP] Ignore .gitignore
A `.gitignore' will make packages such as
`net.minecraft.world.entity.ai.goal.**target**` be ignored. This causes
the entire patch to not apply, which is very suspicious. This commit
adds a `--force' parameter to the `git add' command we run, as per `man
git-add':
```
-f, --force
Allow adding otherwise ignored files.
```
The global configuration file was proven problematic, then fixed by
this by commit by Prof_Bloodstone#0123 and thekinrar#0001 on Discord
(`#paper-dev').
CI-SKIP: This does not apply to the CI, therefore it is not worthy of
its own build.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/importmcdev.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/importmcdev.sh b/scripts/importmcdev.sh index 6165a7195b..d438a5a5cf 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 . -A >/dev/null 2>&1 +$gitcmd add . --force -A >/dev/null 2>&1 echo -e "mc-dev Imports\n\n$MODLOG" | $gitcmd commit . -F - ) |