mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

[CI-SKIP] Ignore gitignore when adding files in automation

Browse source 
Continuation of #5387

Fixes #5456
This commit is contained in:
Professor Bloodstone 2021-04-05 13:14:54 +02:00 • committed by Kyle Wood
parent d8e384a164
commit 304a216ba5
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/upstreamMerge.sh
View file

@ -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