Ignore branch suggestions that do not have a valid SHA1
One of the branches that comes back from the branch API is 'HEAD' which
just refers to 'main'. But it can not be pushed to so it shouldn't show
up in the gr-repo-branch-picker or the user will get command suggestions
that do not work.
Screenshot where this shows up: https://imgur.com/a/TQk3dju
Google-Bug-Id: b/234484313
Release-Notes: skip
Change-Id: I456991ef3e3349a32025fdd512ee0b37728c36d7
(cherry picked from commit 69bb37f1b86f8a5bd3d18bb19c878f19aabcf9f6)
diff --git a/polygerrit-ui/app/elements/shared/gr-repo-branch-picker/gr-repo-branch-picker.ts b/polygerrit-ui/app/elements/shared/gr-repo-branch-picker/gr-repo-branch-picker.ts
index 9c88c5c..90ce8bb 100644
--- a/polygerrit-ui/app/elements/shared/gr-repo-branch-picker/gr-repo-branch-picker.ts
+++ b/polygerrit-ui/app/elements/shared/gr-repo-branch-picker/gr-repo-branch-picker.ts
@@ -140,15 +140,17 @@
private branchResponseToSuggestions(res: BranchInfo[] | undefined) {
if (!res) return [];
- return res.map(branchInfo => {
- let branch;
- if (branchInfo.ref.startsWith(REF_PREFIX)) {
- branch = branchInfo.ref.substring(REF_PREFIX.length);
- } else {
- branch = branchInfo.ref;
- }
- return {name: branch, value: branch};
- });
+ return res
+ .filter(branchInfo => branchInfo.ref !== 'HEAD')
+ .map(branchInfo => {
+ let branch;
+ if (branchInfo.ref.startsWith(REF_PREFIX)) {
+ branch = branchInfo.ref.substring(REF_PREFIX.length);
+ } else {
+ branch = branchInfo.ref;
+ }
+ return {name: branch, value: branch};
+ });
}
// private but used in test
diff --git a/polygerrit-ui/app/elements/shared/gr-repo-branch-picker/gr-repo-branch-picker_test.ts b/polygerrit-ui/app/elements/shared/gr-repo-branch-picker/gr-repo-branch-picker_test.ts
index f8b1343..4c53a03 100644
--- a/polygerrit-ui/app/elements/shared/gr-repo-branch-picker/gr-repo-branch-picker_test.ts
+++ b/polygerrit-ui/app/elements/shared/gr-repo-branch-picker/gr-repo-branch-picker_test.ts
@@ -82,8 +82,9 @@
setup(() => {
getRepoBranchesStub = stubRestApi('getRepoBranches').returns(
Promise.resolve([
- {ref: 'refs/heads/stable-2.10' as GitRef, revision: '123'},
- {ref: 'refs/heads/stable-2.11' as GitRef, revision: '1234'},
+ {ref: 'HEAD' as GitRef, revision: 'main'},
+ {ref: 'refs/heads/stable-2.10' as GitRef, revision: '123af'},
+ {ref: 'refs/heads/stable-2.11' as GitRef, revision: '1234b'},
{ref: 'refs/heads/stable-2.12' as GitRef, revision: '12345'},
{ref: 'refs/heads/stable-2.13' as GitRef, revision: '123456'},
{ref: 'refs/heads/stable-2.14' as GitRef, revision: '1234567'},
