From: Richard W.M. Jones <rjones@redhat.com>
Date: Wed, 8 Jan 2020 22:16:47 +0000 (+0000)
Subject: Do a git pull before bumping local version.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=8c872272fe78596efbc8c105c9d4f38645960b50;hp=328987b627c44db7b16598da18d261d61e13a572;p=fedora-ocaml-rebuild.git

Do a git pull before bumping local version.
---

diff --git a/Goalfile b/Goalfile
index 98a56d0..cafef1d 100644
--- a/Goalfile
+++ b/Goalfile
@@ -120,6 +120,11 @@ goal rebuild (pkg) =
         $koji wait-repo %side-tag --build=$nvr
     done
 
+    # Make sure the local directory is up to date.
+    # This should also fail if there are local changes, which
+    # would need to be corrected/integrated by hand.
+    git pull
+
     # If the specfile doesn't have the magic string then add
     # that now.
     if ! grep -sq %rebuild-name $specfile; then