diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2022-01-24 09:14:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-01-24 09:14:46 -0800 |
| commit | c6e19e47a60c0174f805db8e1624db38ff889523 (patch) | |
| tree | 5528f62eb204380d4586f83653d0382c640c0c2b | |
| parent | Merge tag 'l10n-2.35.0-rnd2' of git://github.com/git-l10n/git-po (diff) | |
| parent | checkout: avoid BUG() when hitting a broken repository (diff) | |
| download | tgif-c6e19e47a60c0174f805db8e1624db38ff889523.tar.xz | |
Merge branch 'ab/checkout-branch-info-leakfix'
We added an unrelated sanity checking that leads to a BUG() while
plugging a leak, which triggered in a repository with symrefs in
the local branch namespace that point at a ref outside. Partially
revert the change to avoid triggering the BUG().
* ab/checkout-branch-info-leakfix:
checkout: avoid BUG() when hitting a broken repository
| -rw-r--r-- | builtin/checkout.c | 3 | ||||
| -rwxr-xr-x | t/t2018-checkout-branch.sh | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 0bc2e63510..cc804ba8e1 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -1094,9 +1094,6 @@ static int switch_branches(const struct checkout_opts *opts, const char *p; if (skip_prefix(old_branch_info.path, prefix, &p)) old_branch_info.name = xstrdup(p); - else - BUG("should be able to skip past '%s' in '%s'!", - prefix, old_branch_info.path); } if (opts->new_orphan_branch && opts->orphan_from_empty_tree) { diff --git a/t/t2018-checkout-branch.sh b/t/t2018-checkout-branch.sh index 3e93506c04..52e51b0726 100755 --- a/t/t2018-checkout-branch.sh +++ b/t/t2018-checkout-branch.sh @@ -85,6 +85,19 @@ test_expect_success 'setup' ' git branch -m branch1 ' +test_expect_success 'checkout a branch without refs/heads/* prefix' ' + git clone --no-tags . repo-odd-prefix && + ( + cd repo-odd-prefix && + + origin=$(git symbolic-ref refs/remotes/origin/HEAD) && + git symbolic-ref refs/heads/a-branch "$origin" && + + git checkout -f a-branch && + git checkout -f a-branch + ) +' + test_expect_success 'checkout -b to a new branch, set to HEAD' ' test_when_finished " git checkout branch1 && |