[PATCH 0/2] remote.c: reject 0-length branch names
- From
Glen Choo via GitGitGadget <gitgitgadget@gmail.com>
- Date
- May 31, 2022, 23:12 UTC
- Message-ID
- <pull.1273.git.git.1654038754.gitgitgadget@gmail.com>
This fixes the regression reported in [1], where Git may fail if it encounters multiple "branch." keys with no subsection, e.g.
[branch ""] remote = foo merge = bar
Prior to 4a2dcb1a08 (remote: die if branch is not found in repository, 2021-11-17), we silently ignored such keys. But that commit had an inconsistency in how we read and write to the branches hash map, causing us to BUG() (see Patch 1/2 for more details).
This small series does two things
* Fix the inconsistency in 4a2dcb1a08 that caused the bug. * Make Git fail if we find such keys (because we'll never use them anyway).
[1] https://lore.kernel.org/git/24f547-6285e280-59-40303580@48243747
Glen Choo (2): remote.c: don't BUG() on 0-length branch names remote.c: reject 0-length branch names
remote.c | 10 ++++++---- t/t5516-fetch-push.sh | 20 ++++++++++++++++++++ 2 files changed, 26 insertions(+), 4 deletions(-)
base-commit: f9b95943b68b6b8ca5a6072f50a08411c6449b55 Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-1273%2Fchooglen%2Fremote%2Fhandle-0-length-branch-v1 Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-1273/chooglen/remote/handle-0-length-branch-v1 Pull-Request: https://github.com/git/git/pull/1273
-- gitgitgadget