diff --git a/.create_single_patch.sh b/.create_single_patch.sh index c2cd9bbbcd88ca4265a3b7d797835adbe62785f2..562c02009156f875355dce9bab6542a6961fce6b 100755 --- a/.create_single_patch.sh +++ b/.create_single_patch.sh @@ -24,9 +24,6 @@ then exit 1 fi -#flag for remembering if a patch should be created using git -shouldRunDiff=true - #check if the exercise-folder exists. Should always exist, as we iterate over them if [ ! -d exercises/$exerciseName ] then @@ -38,7 +35,6 @@ fi if [ ! -d exercises/solution/$exerciseName ] then echo "ERROR: exercises/$exerciseName exists but exercises/solution/$exerciseName does NOT exist." - shouldRunDiff=false # Prompt the user for input - is this solution required? while true; do @@ -51,12 +47,4 @@ then done fi -#depending on the state of shouldRunDiff - create a patch using git diff or an empty patch -if [ $shouldRunDiff = true ] -then - echo "Generating diff for $exerciseName. Storing the patch file into .patches/$exerciseName/$exerciseName.patch" - diff -ruN exercises/$exerciseName exercises/solution/$exerciseName > .patches/$exerciseName/$exerciseName.patch -else - echo "Skipping diff generation for $exerciseName due to previous conflicts. Creating an empty patch..." - touch .patches/$exerciseName/$exerciseName.patch -fi +diff -ruN exercises/$exerciseName/ exercises/solution/$exerciseName > .patches/$exerciseName/$exerciseName.patch \ No newline at end of file