Skip to content

fix(gitops-comments): parse branch vs tag by 'tag:' #2505

Merged
zakisk merged 2 commits intotektoncd:mainfrom
mathur07:SRVKP-10915
Feb 25, 2026
Merged

fix(gitops-comments): parse branch vs tag by 'tag:' #2505
zakisk merged 2 commits intotektoncd:mainfrom
mathur07:SRVKP-10915

Conversation

@mathur07
Copy link
Copy Markdown
Contributor

@mathur07 mathur07 commented Feb 24, 2026

Use strings.Contains(..., "tag:") instead of "tag" when deciding between tag and branch in GitOps comment parsing. Branch names like akurlov/32966-test-tagged-rebuild were mis-parsed as tag, leaving branchName empty and causing 'SHA is not the HEAD of master' on commit comments.

SRVKP-10915

📝 Description of the Change

👨🏻‍ Linked Jira

🔗 Linked GitHub Issue

Fixes #

🚀 Type of Change

  • 🐛 Bug fix (fix:)
  • ✨ New feature (feat:)
  • 💥 Breaking change (feat!:, fix!:)
  • 📚 Documentation update (docs:)
  • ⚙️ Chore (chore:)
  • 💅 Refactor (refactor:)
  • 🔧 Enhancement (enhance:)
  • 📦 Dependency update (deps:)

🧪 Testing Strategy

  • Unit tests
  • Integration tests
  • End-to-end tests
  • Manual testing
  • Not Applicable

🤖 AI Assistance

  • I have not used any AI assistance for this PR.
  • I have used AI assistance for this PR.

If you have used AI assistance, please provide the following details:

Which LLM was used?

  • GitHub Copilot
  • ChatGPT (OpenAI)
  • Claude (Anthropic)
  • Cursor
  • Gemini (Google)
  • Other: ____________

Extent of AI Assistance:

  • Documentation and research only
  • Unit tests or E2E tests only
  • Code generation (parts of the code)
  • Full code generation (most of the PR)
  • PR description and comments
  • Commit message(s)

Important

If the majority of the code in this PR was generated by an AI, please add a Co-authored-by trailer to your commit message.
For example:

Co-authored-by: Gemini gemini@google.com
Co-authored-by: ChatGPT noreply@chatgpt.com
Co-authored-by: Claude noreply@anthropic.com
Co-authored-by: Cursor noreply@cursor.com
Co-authored-by: Copilot Copilot@users.noreply.github.com

**💡You can use the script ./hack/add-llm-coauthor.sh to automatically add
these co-author trailers to your commits.

✅ Submitter Checklist

  • 📝 My commit messages are clear, informative, and follow the project's How to write a git commit message guide. The Gitlint linter ensures in CI it's properly validated
  • ✨ I have ensured my commit message prefix (e.g., fix:, feat:) matches the "Type of Change" I selected above.
  • ♽ I have run make test and make lint locally to check for and fix any
    issues. For an efficient workflow, I have considered installing
    pre-commit and running pre-commit install to
    automate these checks.
  • 📖 I have added or updated documentation for any user-facing changes.
  • 🧪 I have added sufficient unit tests for my code changes.
  • 🎁 I have added end-to-end tests where feasible. See README for more details.
  • 🔎 I have addressed any CI test flakiness or provided a clear reason to bypass it.
  • If adding a provider feature, I have filled in the following and updated the provider documentation:
    • GitHub App
    • GitHub Webhook
    • Gitea/Forgejo
    • GitLab
    • Bitbucket Cloud
    • Bitbucket Data Center

@gemini-code-assist
Copy link
Copy Markdown

Summary of Changes

Hello @mathur07, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request addresses a critical parsing bug in the GitOps comment processing, which previously misidentified certain branch names as tags. By refining the detection mechanism to look for "tag:" instead of just "tag", the system can now correctly differentiate between branches and tags, preventing erroneous pipeline run failures caused by incorrect branch name resolution.

Highlights

  • Parsing Logic Refinement: Modified the GitOps comment parsing logic to use strings.Contains(..., "tag:") instead of strings.Contains(..., "tag") to accurately distinguish between branch names and tags.
  • Bug Fix for Branch/Tag Misidentification: Resolved an issue where branch names containing the substring "tag" (e.g., akurlov/ROX-32966-test-tagged-rebuild) were incorrectly identified as tags, leading to parsing errors and 'SHA is not the HEAD of master' messages.
  • Enhanced Test Coverage: Added a new unit test case to pkg/provider/provider_test.go to specifically validate the corrected parsing behavior for branch names that might contain "tag".
Changelog
  • pkg/provider/provider.go
    • Changed the condition for identifying a tag from strings.Contains(splitText[1], "tag") to strings.Contains(splitText[1], "tag:") to improve accuracy.
  • pkg/provider/provider_test.go
    • Added a new test case named "branch name contains substring tag so not parsed as tag" to verify the fix.
Activity
  • The pull request was created by mathur07.
  • No review comments or approvals have been recorded yet.
  • Automated checks and CI/CD pipelines are expected to run.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

@mathur07 mathur07 requested review from aThorp96 and zakisk February 24, 2026 20:15
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request addresses a bug in parsing GitOps comments where a branch name containing the substring "tag" was incorrectly identified as a tag. The fix correctly requires the tag: prefix to make the distinction, which is a more robust approach. The addition of a specific test case to cover this scenario is a good practice and ensures the bug is resolved. The changes are correct and improve the reliability of comment parsing.

Copy link
Copy Markdown
Member

@aThorp96 aThorp96 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

One request before approval. Also (nitpick) I don't think fix(provider) is correct here even though it is in provider.go. Maybe fix(gitops-comments) or fix(controller) is more accurate? The word in the parenthesis is the scope of logic with change, and this is unrelated to the providers

@mathur07 mathur07 changed the title fix(provider): parse branch vs tag by 'tag:' fix(gitops-comments): parse branch vs tag by 'tag:' Feb 24, 2026
Use strings.Contains(..., "tag:") instead of "tag" when deciding
between tag and branch in /retest comment parsing. Branch names like
akurlov/ROX-32966-test-tagged-rebuild were mis-parsed as tag, leaving
branchName empty and causing 'SHA is not the HEAD of master' on commit
comments.

SRVKP-10915

Signed-off-by: Shubham Mathur <shumathu@redhat.com>
@mathur07
Copy link
Copy Markdown
Contributor Author

/retest

@pipelines-as-code
Copy link
Copy Markdown

🔍 PR Lint Feedback

Note: This automated check helps ensure your PR follows our contribution guidelines.

⚠️ Items that need attention:

🎫 Jira reference

Add a Jira reference in the description using one of the following formats:

  • https://issues.redhat.com/browse/SRVKP-<number>

If no SRVKP ticket exists yet, link a GitHub issue instead (e.g., Fixes #123).
Minor housekeeping PRs without Jira coverage can skip this after confirming with reviewers.


🤖 AI attribution

The following commits lack an explicit AI attribution footer:

  • e53bdda fix(gitops-commands): parse branch vs tag by 'tag:'

If no AI assistance was used for a commit, you can ignore this warning.
Otherwise add an Assisted-by: or Co-authored-by: footer referencing the AI used.


ℹ️ Next Steps

  • Review and address the items above
  • Push new commits to update this PR
  • This comment will be automatically updated when issues are resolved
🔧 Admin Tools (click to expand)

Automated Issue/Ticket Creation:

  • /issue-create - Generate a GitHub issue from this PR content using AI
  • /jira-create - Create a SRVKP Jira ticket from this PR content using AI

⚠️ Important: Always review and edit generated content before finalizing tickets/issues.
The AI-generated content should be used as a starting point and may need adjustments.

These commands are available to maintainers and will post the generated content as PR comments for review.

🤖 This feedback was generated automatically by the PR CI system

@zakisk zakisk merged commit e48931a into tektoncd:main Feb 25, 2026
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants