fix: handle stale branches and configure git identity for tags

- Reset uncommitted changes before checkout to prevent conflicts
- Configure git user identity before creating annotated tags
- Fixes version PR creation when branch exists with changes
- Fixes 'empty ident name' error when creating tags

Author: omermorad

dist/index.js

@@ -130428,6 +130428,11 @@ async function createOrUpdateVersionPR(octokit, context3, options) {
   core3.debug(`Base branch: ${baseBranch}, Version branch: ${options.branch}`);
   await ensureBranchExists(octokit, owner, repo, options.branch, baseBranch);
   git2(`fetch origin ${options.branch}`);
+  try {
+    git2("reset --hard HEAD");
+  } catch {
+    core3.debug("No changes to reset");
+  }
   git2(`checkout ${options.branch}`);
   try {
     git2(`pull origin ${options.branch} --rebase`);
@@ -131258,6 +131263,8 @@ function isPrerelease(version) {
 __name(isPrerelease, "isPrerelease");
 async function createGitTag(tagName, message) {
   core4.info(`Creating git tag: ${tagName}`);
+  await exec("git", ["config", "user.name", "contractual[bot]"]);
+  await exec("git", ["config", "user.email", "contractual[bot]@users.noreply.github.com"]);
   await exec("git", ["tag", "-a", tagName, "-m", message]);
   await exec("git", ["push", "origin", tagName]);
   core4.info(`Tag ${tagName} created and pushed`);

dist/index.js.map

@@ -53,8 +53,16 @@ export async function createOrUpdateVersionPR(
   // Ensure branch exists
   await ensureBranchExists(octokit, owner, repo, options.branch, baseBranch);
 
-  // Checkout the version branch
+  // Checkout the version branch (force to handle any uncommitted changes)
   git(`fetch origin ${options.branch}`);
+
+  try {
+    // Try to reset any uncommitted changes before checkout
+    git('reset --hard HEAD');
+  } catch {
+    core.debug('No changes to reset');
+  }
+
   git(`checkout ${options.branch}`);
 
   // Pull latest changes to avoid conflicts

src/github/pull-requests.ts

@@ -80,6 +80,10 @@ export function isPrerelease(version: string): boolean {
 export async function createGitTag(tagName: string, message: string): Promise<void> {
   core.info(`Creating git tag: ${tagName}`);
 
+  // Configure git identity for tag creation
+  await exec.exec('git', ['config', 'user.name', 'contractual[bot]']);
+  await exec.exec('git', ['config', 'user.email', 'contractual[bot]@users.noreply.github.com']);
+
   // Create annotated tag
   await exec.exec('git', ['tag', '-a', tagName, '-m', message]);