From 262a3ec3ebce60fc292c44c9aef4d1000518f34c Mon Sep 17 00:00:00 2001
From: Jean-Paul Calderone <exarkun@twistedmatrix.com>
Date: Wed, 13 Jul 2022 16:49:41 -0400
Subject: [PATCH] Compare against our merge target
Previous CI runs created TARGET_BRANCH and updated it but failed to push. But
the branch still exists in the CI environment, with the changes! Hooray.
Mutable shit!
---
ci-tools/update-nixpkgs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/ci-tools/update-nixpkgs b/ci-tools/update-nixpkgs
index f30bc254..bdd0d2d2 100755
--- a/ci-tools/update-nixpkgs
+++ b/ci-tools/update-nixpkgs
@@ -42,7 +42,7 @@ git checkout "${TARGET_BRANCH}" || git checkout -b "${TARGET_BRANCH}"
nix-shell ./shell.nix --run 'update-nixpkgs --dry-run'
# Show us what we did
-if git diff --exit-code; then
+if git diff --exit-code origin/develop...; then
echo "No changes."
exit 0
fi
--
GitLab