From 341ee34eb0c510bf3e445c2a2fba19acbb5e20d2 Mon Sep 17 00:00:00 2001 From: mohammed jasem alaajel <34905970+ham1255@users.noreply.github.com> Date: Tue, 15 Jun 2021 01:05:53 +0400 Subject: [PATCH] fixed all errors when generating patches --- applyPatches.sh | 2 ++ reBuildPatches.sh | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/applyPatches.sh b/applyPatches.sh index fa84a52..635c4ec 100644 --- a/applyPatches.sh +++ b/applyPatches.sh @@ -15,6 +15,8 @@ applyPatch() { fi echo "$basedir/$target" cd "$basedir/$target" + #git checkout -d origin + git checkout $branch echo "Resetting $target to $what..." git config commit.gpgSign false echo " Applying patches to $target..." diff --git a/reBuildPatches.sh b/reBuildPatches.sh index 035ac23..19caa83 100644 --- a/reBuildPatches.sh +++ b/reBuildPatches.sh @@ -29,7 +29,7 @@ savePatches() { target=$2 branch=$3 cd "$basedir/$target" - git format-patch --no-stat -N -o "../${what}-Patches/" $branch + git format-patch --no-stat -N -o "../${what}-Patches/" origin/$branch cd "$basedir" git add -A "${what}-Patches" if [ "$clean" != "clean" ]; then