Allow branchnames to be named the same as the commit it points to
In the case where the branch name is a valid commit ID too, git will display a warning message like:
warning: refname '6733c897c319018fd0753caf8d4f8eb1fa35d75e' is ambiguous. Git normally never creates a ref that ends with 40 hex characters because it will be ignored when you just specify 40-hex. These refs may be created by mistake. For example,
git checkout -b $br $(git rev-parse ...)
where "$br" is somehow empty and a 40-hex ref is created. Please examine these refs and maybe delete them. Turn this message off by running "git config advice.objectNameWarning false"
This is hard to parse for GitLab and can result in webpages returning status code 500 in the %10.5 release candidates.
Does this MR meet the acceptance criteria?
-
Changelog entry added, if necessary -
Tests added for this feature/bug - Review
-
Has been reviewed by Backend
-
Merge request reports
Activity
marked the checklist item Changelog entry added, if necessary as completed
changed milestone to %10.5
assigned to @jacobvosmaer-gitlab
Somehow my push didn't trigger a pipeline, started https://gitlab.com/zj/gitlab-ce/pipelines/17828129 manually.
Edit: Diffs weren't updated either, so I
git commit --no-edit --amend
it to update the SHA so I push again.Edited by Zeger-Jan van de Wegadded 1 commit
- 38aaa9f6 - Handle branch and tag names which are commit ids
- Resolved by Zeger-Jan van de Weg
@zj this makes a lot of sense!
Could you remove the nesting/quoting in the MR description?
assigned to @zj
assigned to @jacobvosmaer-gitlab
added 1 commit
- d90e1424 - Handle branch and tag names which are commit ids
assigned to @zj
added 180 commits
-
d90e1424...9ff91bc4 - 179 commits from branch
gitlab-org:master
- 8b5f82db - Handle branch and tag names which are commit ids
-
d90e1424...9ff91bc4 - 179 commits from branch
mentioned in issue gitaly#1033 (closed)
assigned to @jacobvosmaer-gitlab