Merge branch 'debug-update-mail-to-commit-notes'

Author: dscho

lib/ci-helper.ts

@@ -262,6 +262,23 @@ export class CIHelper {
             },
         );
         console.timeEnd("fetch Git notes");
+        console.time("forcing `gitgitgadget` notes refs back in time");
+        await git(["update-ref", "refs/notes/gitgitgadget", "07cbd089352a850817060742d649adb4c4c99445"], {
+            workDir: this.workDir,
+        });
+        console.timeEnd("forcing `gitgitgadget` notes refs back in time");
+        if (setupOptions?.needsMailToCommitNotes) {
+            console.time("forcing `commit-to-mail` notes refs back in time");
+            await git(["update-ref", "refs/notes/commit-to-mail", "de5f0ffd77eabc913e560acb4f3303b6e3df4163"], {
+                workDir: this.workDir,
+            });
+            console.timeEnd("forcing `commit-to-mail` notes refs back in time");
+            console.time("forcing `mail-to-commit` notes refs back in time");
+            await git(["update-ref", "refs/notes/mail-to-commit", "92b87ef409b0858d188a371a6af30aa477bc549f"], {
+                workDir: this.workDir,
+            });
+            console.timeEnd("forcing `mail-to-commit` notes refs back in time");
+        }
         this.gggNotesUpdated = true;
         if (setupOptions?.needsUpstreamBranches) {
             console.time("fetch upstream branches");

script/lookup-commit.sh

@@ -68,6 +68,9 @@ update_gitgit_dir () {
 	git -C "$GITGIT_DIR" fetch $git_remote refs/notes/commit-to-mail:refs/notes/commit-to-mail ||
 	die "Could not update refs/notes/commit-to-mail"
 
+	git -C "$GITGIT_DIR" update-ref refs/notes/commit-to-mail de5f0ffd77eabc913e560acb4f3303b6e3df4163
+	git -C "$GITGIT_DIR" update-ref refs/notes/mail-to-commit 92b87ef409b0858d188a371a6af30aa477bc549f
+
 	if git -C "$GITGIT_DIR" rev-parse --verify refs/remotes/upstream/seen >/dev/null 2>&1
 	then
 		# Let's take 'seen' from the official source at git.git.

script/update-mail-to-commit-notes.sh

@@ -23,7 +23,7 @@ update_gitgit_dir () {
 	git clone $git_remote "$GITGIT_DIR" ||
 	die "Could not clone $git_remote to $GITGIT_DIR"
 
-	git -C "$GITGIT_DIR" fetch $git_remote \
+echo	git -C "$GITGIT_DIR" fetch $git_remote \
 		refs/notes/mail-to-commit:refs/notes/mail-to-commit ||
 	die "Could not update notes"
 }