mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-03 01:10:37 +01:00
d45565f83b
Instead of checking whether it was set previously, setting it to false, then setting it back to true if it was true before, just use the command-line argument in git to override the config for that command. Using a variable makes it pretty painless to do.
76 lines
1.8 KiB
Bash
Executable File
76 lines
1.8 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
gitcmd="git -c commit.gpgsign=false"
|
|
|
|
noapply=1
|
|
isreject=0
|
|
if [[ $1 == "--noapplied" ]]; then
|
|
noapply=1
|
|
shift
|
|
fi
|
|
|
|
if [ ! -z "$1" ]; then
|
|
file="$1"
|
|
elif [ -z "$1" ] && [ -f .git/rebase-apply/patch ]; then
|
|
file=".git/rebase-apply/patch"
|
|
noapply=1
|
|
isreject=1
|
|
else
|
|
echo "Please specify a file"
|
|
exit 1
|
|
fi
|
|
applied=$(echo $file | sed 's/.patch$/-applied\.patch/g')
|
|
if [ "$1" == "--reset" ]; then
|
|
$gitcmd am --abort
|
|
$gitcmd reset --hard
|
|
$gitcmd clean -f
|
|
exit 0
|
|
fi
|
|
|
|
|
|
(test "$isreject" != "1" && $gitcmd am -3 $file) || (
|
|
echo "Failures - Wiggling"
|
|
$gitcmd reset --hard
|
|
$gitcmd clean -f
|
|
errors=$($gitcmd apply --rej $file 2>&1)
|
|
echo "$errors" >> ~/patch.log
|
|
export missingfiles=""
|
|
export summaryfail=""
|
|
export summarygood=""
|
|
for i in $(find . -name \*.rej); do
|
|
base=$(echo "$i" | sed 's/.rej//g')
|
|
if [ -f "$i" ]; then
|
|
sed -e 's/^diff a\/\(.*\) b\/\(.*\)[[:space:]].*rejected.*$/--- \1\n+++ \2/' -i $i && wiggle -v -l --replace "$base" "$i"
|
|
rm "$base.porig" "$i"
|
|
else
|
|
echo "No such file: $base"
|
|
missingfiles="$missingfiles\n$base"
|
|
fi
|
|
done
|
|
for i in $($gitcmd status --porcelain | awk '{print $2}'); do
|
|
filedata=$(cat "$i")
|
|
if [ -f "$file" ] && [[ "$filedata" == *"<<<<<"* ]]; then
|
|
export summaryfail="$summaryfail\nFAILED TO APPLY: $i"
|
|
else
|
|
$gitcmd add "$i"
|
|
export summarygood="$summarygood\nAPPLIED CLEAN: $i"
|
|
fi
|
|
done
|
|
echo -e "$summarygood"
|
|
echo -e "$summaryfail"
|
|
if [[ "$errors" == *"No such file"* ]]; then
|
|
echo "===========================";
|
|
echo " "
|
|
echo " MISSING FILES"
|
|
echo $(echo "$errors" | grep "No such file")
|
|
echo -e "$missingfiles"
|
|
echo " "
|
|
echo "===========================";
|
|
fi
|
|
$gitcmd status
|
|
$gitcmd diff
|
|
)
|
|
if [[ "$noapply" != "1" ]] && [[ "$file" != *-applied.patch ]]; then
|
|
mv "$file" "$applied"
|
|
fi
|