From 7f21a884394ab858cdd7cbae5d3a75bee0a26f58 Mon Sep 17 00:00:00 2001
From: jovnc <95868357+jovnc@users.noreply.github.com>
Date: Mon, 5 Jan 2026 23:06:10 +0800
Subject: [PATCH 1/3] [branch-forward] Add checkout main in download.py

---
 branch_forward/download.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/branch_forward/download.py b/branch_forward/download.py
index 8ca5ef9a..c9ee8b02 100644
--- a/branch_forward/download.py
+++ b/branch_forward/download.py
@@ -60,3 +60,4 @@ def setup(verbose: bool = False):
     )
     add(["story.txt"], verbose)
     commit("Mention Ginny is single", verbose)
+    checkout("main", False, verbose)

From 3d6e5765a58a88724fbda89bf0bf4b88be599a41 Mon Sep 17 00:00:00 2001
From: jovnc <95868357+jovnc@users.noreply.github.com>
Date: Mon, 5 Jan 2026 23:06:28 +0800
Subject: [PATCH 2/3] [branch-forward] Add initial state in verification logic

---
 branch_forward/test_verify.py | 1 +
 branch_forward/verify.py      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/branch_forward/test_verify.py b/branch_forward/test_verify.py
index 8bb2511c..a3509299 100644
--- a/branch_forward/test_verify.py
+++ b/branch_forward/test_verify.py
@@ -23,6 +23,7 @@
 @contextmanager
 def base_setup() -> Iterator[Tuple[GitAutograderTest, RepoSmith]]:
     with loader.start() as (test, rs):
+        rs.git.commit(message="Set initial state", allow_empty=True)
         rs.git.commit(message="Introduce Harry", allow_empty=True)
         rs.git.commit(message="Add about family", allow_empty=True)
 
diff --git a/branch_forward/verify.py b/branch_forward/verify.py
index 4874f071..2534f214 100644
--- a/branch_forward/verify.py
+++ b/branch_forward/verify.py
@@ -13,6 +13,7 @@
 ONLY_WITH_SALLY_MERGED = "Only one of the two starting branches can be fast-forward merged into 'main'. Do not create new branches."
 
 EXPECTED_MAIN_COMMIT_MESSAGES = {
+    "Set initial state",
     "Introduce Harry",
     "Add about family",
     "Add cast.txt",

From aedf94de841635043e713ff467e2a5d8d93c5491 Mon Sep 17 00:00:00 2001
From: jovnc <95868357+jovnc@users.noreply.github.com>
Date: Tue, 6 Jan 2026 23:24:58 +0800
Subject: [PATCH 3/3] [branch-forward] Remove checkout main in download.py

---
 branch_forward/download.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/branch_forward/download.py b/branch_forward/download.py
index c9ee8b02..8ca5ef9a 100644
--- a/branch_forward/download.py
+++ b/branch_forward/download.py
@@ -60,4 +60,3 @@ def setup(verbose: bool = False):
     )
     add(["story.txt"], verbose)
     commit("Mention Ginny is single", verbose)
-    checkout("main", False, verbose)