From a891914b9aeba61fb5647277143cfbcc295689f6 Mon Sep 17 00:00:00 2001 From: daijro Date: Wed, 14 Aug 2024 00:41:35 -0500 Subject: [PATCH] Makefile: Remove revert from dir command Removes git reset when running `make dir`. This avoids errors when using `make setup-minimal`. --- Makefile | 1 - scripts/developer.py | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0899e17..6cf998c 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,6 @@ dir: @if [ ! -d $(cf_source_dir) ]; then \ make setup; \ fi - make revert python3 scripts/patch.py $(version) $(release) touch $(cf_source_dir)/_READY diff --git a/scripts/developer.py b/scripts/developer.py index 62f0bf0..cb37e8f 100644 --- a/scripts/developer.py +++ b/scripts/developer.py @@ -23,7 +23,7 @@ def into_camoufox_dir(): def reset_camoufox(): """Reset the Camoufox source""" with temp_cd('..'): - run('make revert') + run('make clean') def run_patches(reverse=False): @@ -172,6 +172,7 @@ def handle_choice(choice): case "Create new patch": # Reset camoufox, apply all patches, then create a checkpoint + reset_camoufox() with temp_cd('..'): run('make dir') run('make checkpoint')