From 1d8cfeafa55bc61b7a25999f58b49c7122fc94ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=B6ller?= Date: Mon, 24 Feb 2025 22:30:37 +0100 Subject: [PATCH] Fix Review.build_commit merge behavior --- nixpkgs_review/review.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixpkgs_review/review.py b/nixpkgs_review/review.py index 969fe829..7fa4c636 100644 --- a/nixpkgs_review/review.py +++ b/nixpkgs_review/review.py @@ -221,7 +221,7 @@ def build_commit( if self.only_packages: if reviewed_commit is None: self.apply_unstaged(staged) - elif self.checkout == CheckoutOption.MERGE: + elif self.checkout == CheckoutOption.COMMIT: self.git_checkout(reviewed_commit) else: self.git_merge(reviewed_commit) @@ -246,7 +246,7 @@ def build_commit( if reviewed_commit is None: self.apply_unstaged(staged) - elif self.checkout == CheckoutOption.MERGE: + elif self.checkout == CheckoutOption.COMMIT: self.git_checkout(reviewed_commit) else: self.git_merge(reviewed_commit)