reverts and fixes

Author: ludamad

noir/postcheckout.sh

@@ -7,8 +7,8 @@ cd $(dirname $0)
 
 is_branch=${3:-}
 
-# if [ "$is_branch" == "1" ] && scripts/sync.sh needs-patch; then
-#     echo "Warning: the noir-repo has outstanding commits that need to be put in a patch file"
-#     echo "with the './noir/bootstrap.sh make-patch' command, then committed to the appropriate branch"
-#     echo "in aztec-packages in order to ensure they don't get lost if the noir-repo is switched."
-# fi
+if [ "$is_branch" == "1" ] && scripts/sync.sh needs-patch; then
+    echo "Warning: the noir-repo has outstanding commits that need to be put in a patch file"
+    echo "with the './noir/bootstrap.sh make-patch' command, then committed to the appropriate branch"
+    echo "in aztec-packages in order to ensure they don't get lost if the noir-repo is switched."
+fi

noir/scripts/sync.sh

@@ -294,21 +294,21 @@ function update_repo {
 
   # We need to switch branches.
 
-  # if has_uncommitted_changes; then
-  #   echo "Error: noir-repo has uncommitted changes which could get lost if we switch to $want"
-  #   echo "Please commit these changes and consider pushing them upstream to make sure they are not lost."
-  #   exit 1
-  # fi
-
-  # if needs_patch; then
-  #   echo "Error: noir-repo is on a detached HEAD and the last commit is not the patch marker commit;"
-  #   echo "switching to $want could mean losing those commits."
-  #   echo "Please use the 'make-patch' command to create a $NOIR_REPO_PATCH file and commit it in aztec-packages, "
-  #   echo "so that it is re-applied after each checkout. Make sure to commit the patch on the branch where it should be."
-  #   exit 1
-  # fi
-
-  # switch_repo $want
+  if has_uncommitted_changes; then
+    echo "Error: noir-repo has uncommitted changes which could get lost if we switch to $want"
+    echo "Please commit these changes and consider pushing them upstream to make sure they are not lost."
+    exit 1
+  fi
+
+  if needs_patch; then
+    echo "Error: noir-repo is on a detached HEAD and the last commit is not the patch marker commit;"
+    echo "switching to $want could mean losing those commits."
+    echo "Please use the 'make-patch' command to create a $NOIR_REPO_PATCH file and commit it in aztec-packages, "
+    echo "so that it is re-applied after each checkout. Make sure to commit the patch on the branch where it should be."
+    exit 1
+  fi
+
+  switch_repo $want
 }
 
 # Create a patch file from any outstanding commits in noir-repo